diff --git a/src/platform/packages/private/kbn-esql-editor/src/esql_editor.tsx b/src/platform/packages/private/kbn-esql-editor/src/esql_editor.tsx
index fad6b8d372f2b..584a9a0161c8d 100644
--- a/src/platform/packages/private/kbn-esql-editor/src/esql_editor.tsx
+++ b/src/platform/packages/private/kbn-esql-editor/src/esql_editor.tsx
@@ -1335,9 +1335,10 @@ const ESQLEditorInternal = function ESQLEditor({
           query={code}
           isSpaceReduced={Boolean(editorIsInline) || measuredEditorWidth < BREAKPOINT_WIDTH}
           isVisible={isVisorOpen}
-          onUpdateAndSubmitQuery={(newQuery) =>
-            onUpdateAndSubmitQuery(newQuery, QuerySource.QUICK_SEARCH)
-          }
+          onUpdateAndSubmitQuery={(newQuery) => {
+            onUpdateAndSubmitQuery(newQuery, QuerySource.QUICK_SEARCH);
+            editorRef.current?.focus();
+          }}
           onToggleVisor={onToggleVisor}
         />
       )}