diff --git a/test/data/ui-screenshots/omnibox.test.ts/command-palette-keyboard-navigation/command-palette-pos-end-1.png.sha256 b/test/data/ui-screenshots/omnibox.test.ts/command-palette-keyboard-navigation/command-palette-pos-end-1.png.sha256
index a288b79774d..0f8d4bf4c50 100644
--- a/test/data/ui-screenshots/omnibox.test.ts/command-palette-keyboard-navigation/command-palette-pos-end-1.png.sha256
+++ b/test/data/ui-screenshots/omnibox.test.ts/command-palette-keyboard-navigation/command-palette-pos-end-1.png.sha256
@@ -1 +1 @@
-ac7f46b7923ce72d3169d94cc7e65a7ca4c3183ae12935d29ae624f93768b8c7
\ No newline at end of file
+b42a4fde8d72ad48da91225bb95c9da2165e428b627619cdcd5ddebe7810f846
\ No newline at end of file
diff --git a/test/data/ui-screenshots/omnibox.test.ts/command-palette-keyboard-navigation/command-palette-pos-end-2.png.sha256 b/test/data/ui-screenshots/omnibox.test.ts/command-palette-keyboard-navigation/command-palette-pos-end-2.png.sha256
index 605cd0bbe40..b7a810d8261 100644
--- a/test/data/ui-screenshots/omnibox.test.ts/command-palette-keyboard-navigation/command-palette-pos-end-2.png.sha256
+++ b/test/data/ui-screenshots/omnibox.test.ts/command-palette-keyboard-navigation/command-palette-pos-end-2.png.sha256
@@ -1 +1 @@
-451ccf06b779ec4abf550f875db0c289c767d3702d92ad2649cb7b3e3e7b6e8c
\ No newline at end of file
+189566f8a644f33f4341790a42ce4c908f58dbc27f13be691181365a6d142466
\ No newline at end of file
diff --git a/ui/src/plugins/dev.perfetto.QueryPage/query_page.ts b/ui/src/plugins/dev.perfetto.QueryPage/query_page.ts
index eca898eba68..2a3fea86af6 100644
--- a/ui/src/plugins/dev.perfetto.QueryPage/query_page.ts
+++ b/ui/src/plugins/dev.perfetto.QueryPage/query_page.ts
@@ -309,6 +309,7 @@ export class QueryPage implements m.ClassComponent<QueryPageAttrs> {
           ),
         ),
       m(Editor, {
+        autofocus: true, // Auto focus when we create a new tab for instance.
         language: 'perfetto-sql',
         text: tab.editorText,
         onUpdate: (content) => attrs.onEditorContentUpdate?.(tab.id, content),