diff --git a/packages/web/src/tabs/QueryTab.svelte b/packages/web/src/tabs/QueryTab.svelte
index 59d05e87b..3ab801629 100644
--- a/packages/web/src/tabs/QueryTab.svelte
+++ b/packages/web/src/tabs/QueryTab.svelte
@@ -199,6 +199,12 @@
     domEditor?.getEditor()?.focus();
   }
 
+  $: {
+    if (!isAiAssistantVisible && domEditor) {
+      domEditor?.getEditor()?.focus();
+    }
+  }
+
   export function isSqlEditor() {
     return driver?.databaseEngineTypes?.includes('sql');
   }