diff --git a/services/web/frontend/js/features/source-editor/extensions/cursor-position.ts b/services/web/frontend/js/features/source-editor/extensions/cursor-position.ts
index eafa407dce..52579b1940 100644
--- a/services/web/frontend/js/features/source-editor/extensions/cursor-position.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/cursor-position.ts
@@ -122,12 +122,13 @@ const dispatchSelectionAndScroll = (
   view: EditorView,
   selection: SelectionRange
 ) => {
-  view.dispatch({
-    selection,
-    effects: EditorView.scrollIntoView(selection, { y: 'center' }),
+  window.setTimeout(() => {
+    view.dispatch({
+      selection,
+      effects: EditorView.scrollIntoView(selection, { y: 'center' }),
+    })
+    view.focus()
   })
-
-  view.focus()
 }
 
 export const setCursorLineAndScroll = (