diff --git a/webapp/packages/core-app/src/TopNavBar/ConnectionSchemaManager/ConnectionSelector/ConnectionSelectorController.ts b/webapp/packages/core-app/src/TopNavBar/ConnectionSchemaManager/ConnectionSelector/ConnectionSelectorController.ts
index 982010b3bd..f50e8646f1 100644
--- a/webapp/packages/core-app/src/TopNavBar/ConnectionSchemaManager/ConnectionSelector/ConnectionSelectorController.ts
+++ b/webapp/packages/core-app/src/TopNavBar/ConnectionSchemaManager/ConnectionSelector/ConnectionSelectorController.ts
@@ -117,6 +117,7 @@ export class ConnectionSelectorController {
       currentConnectionIcon: computed,
       objectContainerSelectionDisabled: computed,
       currentObjectContainerIcon: computed,
+      isObjectContainerSelectorVisible: computed,
     });
 
     this.connectionMenu = new ComputedMenuItemModel({
diff --git a/webapp/packages/core-app/src/shared/NavigationTabs/NavigationTabsService.ts b/webapp/packages/core-app/src/shared/NavigationTabs/NavigationTabsService.ts
index 03d03e6ee1..c015e29b63 100644
--- a/webapp/packages/core-app/src/shared/NavigationTabs/NavigationTabsService.ts
+++ b/webapp/packages/core-app/src/shared/NavigationTabs/NavigationTabsService.ts
@@ -146,13 +146,12 @@ export class NavigationTabsService {
       this.userTabsState.history = this.userTabsState.history.filter(id => id !== tabId);
       this.userTabsState.history.unshift(tabId);
       this.userTabsState.currentId = tabId;
+      this.tabSelectSubject.next(tab);
     }
 
     if (!skipHandlers) {
       await this.callHandlerCallback(tab, handler => handler.onSelect);
     }
-
-    this.tabSelectSubject.next(tab);
   }
 
   async closeTab(tabId: string, skipHandlers?: boolean): Promise<void> {