diff --git a/packages/grafana-e2e/cypress.json b/packages/grafana-e2e/cypress.json
index eaa48eb162f..7eafaf4bf2b 100644
--- a/packages/grafana-e2e/cypress.json
+++ b/packages/grafana-e2e/cypress.json
@@ -1,5 +1,7 @@
 {
   "projectId": "zb7k1c",
   "supportFile": "cypress/support/index.ts",
-  "videoCompression": 20
+  "videoCompression": 20,
+  "viewportWidth": 1920,
+  "viewportHeight": 1080
 }
diff --git a/packages/grafana-e2e/src/flows/addDashboard.ts b/packages/grafana-e2e/src/flows/addDashboard.ts
index 36dca49b86b..a8c02d8e1fe 100644
--- a/packages/grafana-e2e/src/flows/addDashboard.ts
+++ b/packages/grafana-e2e/src/flows/addDashboard.ts
@@ -236,9 +236,9 @@ const addVariable = (config: PartialAddVariableConfig, isFirst: boolean): AddVar
     e2e.pages.Dashboard.Settings.Variables.Edit.General.generalTypeSelectV2()
       .should('be.visible')
       .within(() => {
-        e2e.components.Select.singleValue().should('have.text', 'Query').click();
+        e2e.components.Select.singleValue().should('have.text', 'Query').parent().click();
       });
-    e2e.components.Select.option().should('be.visible').contains(type).click();
+    e2e.pages.Dashboard.Settings.Variables.Edit.General.generalTypeSelectV2().find('input').type(`${type}{enter}`);
   }
 
   if (label) {