diff --git a/frontend/test/metabase/scenarios/dashboard/x-rays.cy.spec.js b/frontend/test/metabase/scenarios/dashboard/x-rays.cy.spec.js
index e7d08ccd30fc0e1999412a9eb9b4cfc7dd35ff48..7e60138d6a2235e56468fb3e93095c56a863b489 100644
--- a/frontend/test/metabase/scenarios/dashboard/x-rays.cy.spec.js
+++ b/frontend/test/metabase/scenarios/dashboard/x-rays.cy.spec.js
@@ -2,7 +2,6 @@ import {
   restore,
   getDimensionByName,
   visitQuestionAdhoc,
-  popover,
   summarize,
   visualize,
   startNewQuestion,
@@ -163,7 +162,9 @@ describe("scenarios > x-rays", () => {
   it("should be able to click the title of an x-ray dashcard to see it in the query builder (metabase#19405)", () => {
     const timeout = { timeout: 10000 };
 
+    cy.intercept("GET", "/app/assets/geojson/**").as("geojson");
     cy.visit(`/auto/dashboard/table/${ORDERS_ID}`);
+    cy.wait("@geojson", { timeout });
 
     // confirm results of "Total transactions" card are present
     cy.findByText("18,760", timeout);
@@ -177,11 +178,10 @@ describe("scenarios > x-rays", () => {
 
     // add a parameter filter to the auto dashboard
     cy.findByText("State", timeout).click();
-    popover().within(() => {
-      cy.findByPlaceholderText("Search the list").type("GA{enter}");
-      cy.findByText("GA").click();
-      cy.findByText("Add filter").click();
-    });
+
+    cy.findByPlaceholderText("Search the list").type("GA{enter}");
+    cy.findByTestId("GA-filter-value").should("be.visible").click();
+    cy.button("Add filter").click();
 
     // confirm results of "Total transactions" card were updated
     cy.findByText("463", timeout);