diff --git a/apps/desktop/src/components/editor/QueryEditor.vue b/apps/desktop/src/components/editor/QueryEditor.vue
index bfe5e2423..847f66775 100644
--- a/apps/desktop/src/components/editor/QueryEditor.vue
+++ b/apps/desktop/src/components/editor/QueryEditor.vue
@@ -1469,7 +1469,15 @@ function openReplace(): boolean {
   return searchPanelRef.value?.openReplace() ?? false;
 }
 
-defineExpose({ openSearch, openReplace });
+function scrollCursorIntoView() {
+  if (!view.value || !editorViewModule) return;
+  const pos = view.value.state.selection.main.head;
+  view.value.dispatch({
+    effects: editorViewModule.EditorView.scrollIntoView(pos, { y: "nearest" }),
+  });
+}
+
+defineExpose({ openSearch, openReplace, scrollCursorIntoView });
 </script>
 
 <template>
diff --git a/apps/desktop/src/components/layout/ContentArea.vue b/apps/desktop/src/components/layout/ContentArea.vue
index fb92a2eb1..97cc884d2 100644
--- a/apps/desktop/src/components/layout/ContentArea.vue
+++ b/apps/desktop/src/components/layout/ContentArea.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, ref, defineAsyncComponent, watch } from "vue";
+import { computed, ref, defineAsyncComponent, watch, nextTick } from "vue";
 import { useI18n } from "vue-i18n";
 import {
   Check,
@@ -171,6 +171,19 @@ watch(
   },
 );
 
+watch(
+  () => props.activeTab.isExecuting,
+  (isExecuting, wasExecuting) => {
+    if (!isExecuting && wasExecuting) {
+      nextTick(() => {
+        requestAnimationFrame(() => {
+          queryEditorRef.value?.scrollCursorIntoView();
+        });
+      });
+    }
+  },
+);
+
 // Column info panel handlers
 async function onHandleClickColumn(
   matchedCols: Array<{ name: string; table: string; schema?: string }>,