diff --git a/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSchemaManagerBootstrap.ts b/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSchemaManagerBootstrap.ts
index 4fdaed4fc9..32e2cc02f7 100644
--- a/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSchemaManagerBootstrap.ts
+++ b/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSchemaManagerBootstrap.ts
@@ -236,7 +236,9 @@ export class ConnectionSchemaManagerBootstrap extends Bootstrap {
 
     this.menuService.addCreator({
       menus: [MENU_CONNECTION_DATA_CONTAINER_SELECTOR],
-      isApplicable: () => this.connectionSchemaManagerService.isObjectCatalogChangeable && !!this.connectionSchemaManagerService.objectContainerList,
+      isApplicable: () =>
+        (this.connectionSchemaManagerService.isObjectCatalogChangeable || this.connectionSchemaManagerService.isObjectSchemaChangeable) &&
+        !!this.connectionSchemaManagerService.objectContainerList,
       getItems: (context, items) => {
         items = [...items];