diff --git a/package.json b/package.json
index 20283c7ca..e55adcdce 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "5.3.2-beta.2",
+  "version": "5.3.2-beta.3",
   "name": "dbgate-all",
   "workspaces": [
     "packages/*",
diff --git a/packages/web/src/buttons/ToolStripContainer.svelte b/packages/web/src/buttons/ToolStripContainer.svelte
index 56e72bb6f..f38683693 100644
--- a/packages/web/src/buttons/ToolStripContainer.svelte
+++ b/packages/web/src/buttons/ToolStripContainer.svelte
@@ -1,11 +1,24 @@
+<script lang="ts">
+  import { get_current_component } from 'svelte/internal';
+  import createActivator, { isComponentActiveStore } from '../utility/createActivator';
+
+  const thisInstance = get_current_component();
+
+  export const activator = createActivator('ToolStripContainer', false);
+
+  $: isComponentActive = $isComponentActiveStore('ToolStripContainer', thisInstance);
+</script>
+
 <div class="wrapper">
   <div class="content">
     <slot />
   </div>
 
-  <div class="toolstrip">
-    <slot name="toolstrip" />
-  </div>
+  {#if isComponentActive}
+    <div class="toolstrip">
+      <slot name="toolstrip" />
+    </div>
+  {/if}
 </div>
 
 <style>
diff --git a/packages/web/src/datagrid/DataGridCore.svelte b/packages/web/src/datagrid/DataGridCore.svelte
index 7ce3921a2..2ab4edb94 100644
--- a/packages/web/src/datagrid/DataGridCore.svelte
+++ b/packages/web/src/datagrid/DataGridCore.svelte
@@ -401,6 +401,7 @@
   import { getDatabaseInfo, useDatabaseStatus } from '../utility/metadataLoaders';
   import { showSnackbarSuccess } from '../utility/snackbar';
   import { openJsonLinesData } from '../utility/openJsonLinesData';
+  import contextMenuActivator from '../utility/contextMenuActivator';
 
   export let onLoadNextData = undefined;
   export let grider = undefined;
@@ -1802,6 +1803,7 @@
     bind:clientWidth={containerWidth}
     bind:clientHeight={containerHeight}
     use:contextMenu={buildMenu}
+    use:contextMenuActivator={activator}
     on:wheel={handleGridWheel}
   >
     <input
diff --git a/packages/web/src/utility/contextMenuActivator.ts b/packages/web/src/utility/contextMenuActivator.ts
new file mode 100644
index 000000000..c488d19f9
--- /dev/null
+++ b/packages/web/src/utility/contextMenuActivator.ts
@@ -0,0 +1,13 @@
+export default function contextMenuActivator(node, activator) {
+  const handleContextMenu = async e => {
+    activator.activate();
+  };
+
+  node.addEventListener('contextmenu', handleContextMenu);
+
+  return {
+    destroy() {
+      node.removeEventListener('contextmenu', handleContextMenu);
+    },
+  };
+}
diff --git a/packages/web/src/utility/createActivator.ts b/packages/web/src/utility/createActivator.ts
index a379c953d..035be2d4f 100644
--- a/packages/web/src/utility/createActivator.ts
+++ b/packages/web/src/utility/createActivator.ts
@@ -1,9 +1,12 @@
 import { getContext } from 'svelte';
 import { get_current_component, onMount, setContext } from 'svelte/internal';
 import invalidateCommands from '../commands/invalidateCommands';
+import { writable } from 'svelte/store';
 
 const lastActiveDictionary = {};
 
+export const isComponentActiveStore = writable((key: string, component) => false as boolean);
+
 function isParent(parent, child) {
   while (child && child.activator) {
     if (parent == child) return true;
@@ -54,7 +57,7 @@ export default function createActivator(
     }
 
     // console.log('toDelete', toDelete);
-    
+
     for (const del of toDelete) {
       delete lastActiveDictionary[del];
     }
@@ -63,6 +66,10 @@ export default function createActivator(
       parentActivatorInstance.activator.activate();
     }
     // console.log('Active components', lastActiveDictionary);
+
+    isComponentActiveStore.set((key, component) => {
+      return lastActiveDictionary[key] == component;
+    });
   };
 
   const getTabVisible = () => tabVisibleValue;