diff --git a/packages/web/src/appobj/DatabaseAppObject.svelte b/packages/web/src/appobj/DatabaseAppObject.svelte
index 620b8441a..fae687412 100644
--- a/packages/web/src/appobj/DatabaseAppObject.svelte
+++ b/packages/web/src/appobj/DatabaseAppObject.svelte
@@ -451,8 +451,10 @@ await dbgateApi.dropAllDbObjects(${JSON.stringify(
     getExtensions,
     getOpenedTabs,
     loadingSchemaLists,
+    lockedDatabaseMode,
     openedConnections,
     openedSingleDatabaseConnections,
+    openedTabs,
     pinnedDatabases,
     selectedWidget,
     visibleWidgetSideBar,
@@ -483,6 +485,7 @@ await dbgateApi.dropAllDbObjects(${JSON.stringify(
   import ExportDbModelModal from '../modals/ExportDbModelModal.svelte';
   import ChooseArchiveFolderModal from '../modals/ChooseArchiveFolderModal.svelte';
   import { extractShellConnection } from '../impexp/createImpExpScript';
+  import { getNumberIcon } from '../icons/FontIcon.svelte';
 
   export let data;
   export let passProps;
@@ -530,7 +533,15 @@ await dbgateApi.dropAllDbObjects(${JSON.stringify(
       .find(x => x.isNewQuery)
       .onClick();
   }}
-  statusIcon={isLoadingSchemas ? 'icon loading' : ''}
+  statusIcon={isLoadingSchemas
+    ? 'icon loading'
+    : $lockedDatabaseMode
+      ? getNumberIcon(
+          $openedTabs.filter(
+            x => !x.closedTime && x.props.conid == data?.connection?._id && x.props.database == data?.name
+          ).length
+        )
+      : ''}
   menu={createMenu}
   showPinnedInsteadOfUnpin={passProps?.showPinnedInsteadOfUnpin}
   onPin={isPinned ? null : () => pinnedDatabases.update(list => [...list, data])}
diff --git a/packages/web/src/widgets/DatabaseWidget.svelte b/packages/web/src/widgets/DatabaseWidget.svelte
index a44db9420..7009bee08 100644
--- a/packages/web/src/widgets/DatabaseWidget.svelte
+++ b/packages/web/src/widgets/DatabaseWidget.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { findEngineDriver } from 'dbgate-tools';
-  import { currentDatabase, extensions, pinnedDatabases, pinnedTables } from '../stores';
+  import { currentDatabase, extensions, pinnedDatabases, pinnedTables, focusedConnectionOrDatabase } from '../stores';
   import { useConfig, useConnectionInfo } from '../utility/metadataLoaders';
 
   import ConnectionList from './ConnectionList.svelte';
@@ -14,6 +14,8 @@
   import DbKeysTree from './DbKeysTree.svelte';
   import SingleConnectionDatabaseList from './SingleConnectionDatabaseList.svelte';
   import _ from 'lodash';
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
+  import { switchCurrentDatabase } from '../utility/common';
 
   export let hidden = false;
   let domSqlObjectList = null;
@@ -79,6 +81,18 @@
   >
     <WidgetsInnerContainer>
       <ErrorInfo message="Database not selected" icon="img alert" />
+
+      {#if $focusedConnectionOrDatabase?.database}
+        <FormStyledButton
+          value={`Switch to ${$focusedConnectionOrDatabase?.database}`}
+          skipWidth
+          on:click={() =>
+            switchCurrentDatabase({
+              connection: $focusedConnectionOrDatabase?.connection,
+              name: $focusedConnectionOrDatabase?.database,
+            })}
+        />
+      {/if}
     </WidgetsInnerContainer>
   </WidgetColumnBarItem>
 </WidgetColumnBar>