diff --git a/test/e2e/extensions.test.ts b/test/e2e/extensions.test.ts
index 70869c03c..376bdce3a 100644
--- a/test/e2e/extensions.test.ts
+++ b/test/e2e/extensions.test.ts
@@ -54,9 +54,9 @@ function runExternalUriTests(proxyEndpointTemplate?: string) {
       await codeServerPage.waitForTestExtensionLoaded()
       await codeServerPage.executeCommandViaMenus("code-server: asExternalUri test")
 
-      const inputBox = codeServerPage.page.locator(".quick-input-widget input")
-      await inputBox.fill(input)
-      await inputBox.press("Enter")
+      await codeServerPage.page.waitForSelector(".quick-input-widget:focus-within")
+      await codeServerPage.page.keyboard.type(input)
+      await codeServerPage.page.keyboard.press("Enter")
 
       // The test extension displays URI.toString(), which also encodes query delimiters.
       const output = `${proxyBase.replace(/\/$/, "")}${suffix}`
diff --git a/test/e2e/models/CodeServer.ts b/test/e2e/models/CodeServer.ts
index 4017445db..4ab6adda6 100644
--- a/test/e2e/models/CodeServer.ts
+++ b/test/e2e/models/CodeServer.ts
@@ -437,6 +437,7 @@ export class CodeServerPage {
   async executeCommandViaMenus(command: string) {
     await this.navigateMenus(["View", "Command Palette..."])
 
+    await codeServerPage.page.waitForSelector(".quick-input-widget:focus-within")
     await this.page.keyboard.type(command)
 
     await this.page.hover(`text=${command}`)