diff --git a/packages/web/src/tabs/ArchiveFileTab.svelte b/packages/web/src/tabs/ArchiveFileTab.svelte
index ed48ba5f1..74e6d1579 100644
--- a/packages/web/src/tabs/ArchiveFileTab.svelte
+++ b/packages/web/src/tabs/ArchiveFileTab.svelte
@@ -170,6 +170,7 @@
       supportsReload
       allowChangeChangeSetStructure
       changeSetState={$changeSetStore}
+      focusOnVisible
       {changeSetStore}
       {dispatchChangeSet}
       {infoLoadCounter}
diff --git a/packages/web/src/tabs/CollectionDataTab.svelte b/packages/web/src/tabs/CollectionDataTab.svelte
index e0ecfe592..03f9fa85d 100644
--- a/packages/web/src/tabs/CollectionDataTab.svelte
+++ b/packages/web/src/tabs/CollectionDataTab.svelte
@@ -191,6 +191,7 @@
     cache={$cache}
     setCache={cache.update}
     changeSetState={$changeSetStore}
+    focusOnVisible
     {display}
     {changeSetStore}
     {dispatchChangeSet}
diff --git a/packages/web/src/tabs/QueryDataTab.svelte b/packages/web/src/tabs/QueryDataTab.svelte
index 6b3544694..227414ec6 100644
--- a/packages/web/src/tabs/QueryDataTab.svelte
+++ b/packages/web/src/tabs/QueryDataTab.svelte
@@ -100,7 +100,7 @@
 
 <ToolStripContainer>
   {#if jslid}
-    <JslDataGrid {jslid} listenInitializeFile onCustomGridRefresh={handleRefresh} />
+    <JslDataGrid {jslid} listenInitializeFile onCustomGridRefresh={handleRefresh} focusOnVisible />
   {:else}
     <LoadingInfo message="Loading data..." />
   {/if}
diff --git a/packages/web/src/tabs/TableDataTab.svelte b/packages/web/src/tabs/TableDataTab.svelte
index 45609a852..83a6f13df 100644
--- a/packages/web/src/tabs/TableDataTab.svelte
+++ b/packages/web/src/tabs/TableDataTab.svelte
@@ -255,6 +255,7 @@
     cache={$cache}
     setCache={cache.update}
     changeSetState={$changeSetStore}
+    focusOnVisible
     {changeSetStore}
     {dispatchChangeSet}
   />
diff --git a/packages/web/src/tabs/ViewDataTab.svelte b/packages/web/src/tabs/ViewDataTab.svelte
index 95d04e72a..a5fb401db 100644
--- a/packages/web/src/tabs/ViewDataTab.svelte
+++ b/packages/web/src/tabs/ViewDataTab.svelte
@@ -68,6 +68,7 @@
       setConfig={config.update}
       cache={$cache}
       setCache={cache.update}
+      focusOnVisible
       hasMultiColumnFilter
       gridCoreComponent={SqlDataGridCore}
       formViewComponent={SqlFormView}