diff --git a/packages/kbn-esql-editor/src/esql_editor.tsx b/packages/kbn-esql-editor/src/esql_editor.tsx
index b4d169f278a0e..244abba93a5f9 100644
--- a/packages/kbn-esql-editor/src/esql_editor.tsx
+++ b/packages/kbn-esql-editor/src/esql_editor.tsx
@@ -719,6 +719,10 @@ export const ESQLEditor = memo(function ESQLEditor({
                     });
 
                     editor.onDidChangeModelContent(showSuggestionsIfEmptyQuery);
+
+                    // Auto-focus the editor and move the cursor to the end.
+                    editor.focus();
+                    editor.setPosition({ column: Infinity, lineNumber: Infinity });
                   }}
                 />
               </div>