From dbdb50f796ab4c44864930eba7ba9fc2b585589c Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Sat, 31 Dec 2022 13:50:51 +0100
Subject: [PATCH] fix

---
 packages/web/src/utility/changeCurrentDbByTab.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/web/src/utility/changeCurrentDbByTab.ts b/packages/web/src/utility/changeCurrentDbByTab.ts
index 3f4ba1a23..2a7603738 100644
--- a/packages/web/src/utility/changeCurrentDbByTab.ts
+++ b/packages/web/src/utility/changeCurrentDbByTab.ts
@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import { currentDatabase, getCurrentDatabase, getLockedDatabaseMode, openedTabs } from '../stores';
 import { shouldShowTab } from '../widgets/TabsPanel.svelte';
-import { callWhenAppLoaded } from './appLoadManager';
+import { callWhenAppLoaded, getAppLoaded } from './appLoadManager';
 import { getConnectionInfo } from './metadataLoaders';
 
 let lastCurrentTab = null;
@@ -32,6 +32,7 @@ openedTabs.subscribe(value => {
 
 currentDatabase.subscribe(currentDb => {
   if (!getLockedDatabaseMode()) return;
+  if (!currentDb && !getAppLoaded()) return;
   openedTabs.update(tabs => {
     const newTabs = tabs.map(tab => ({
       ...tab,