diff --git a/e2e-playwright/panels-suite/panelEdit_queries.spec.ts b/e2e-playwright/panels-suite/panelEdit_queries.spec.ts
index e60a7cc32b3..e13a04081a2 100644
--- a/e2e-playwright/panels-suite/panelEdit_queries.spec.ts
+++ b/e2e-playwright/panels-suite/panelEdit_queries.spec.ts
@@ -40,10 +40,13 @@ test.describe(
       await expect(dashboardPage.getByGrafanaSelector(selectors.components.QueryEditorRows.rows)).toHaveCount(1);
 
       // Duplicate refId B
+      // Open the actions menu
       await dashboardPage
-        .getByGrafanaSelector(selectors.components.QueryEditorRow.actionButton('Duplicate query'))
+        .getByGrafanaSelector(selectors.components.QueryEditorRow.actionButton('Query actions menu'))
         .first()
         .click();
+      // Click duplicate query in the menu
+      await page.getByText('Duplicate query').click();
 
       // We expect row with refId B and A to exist and be visible
       await expect(dashboardPage.getByGrafanaSelector(selectors.components.QueryEditorRows.rows)).toHaveCount(2);
diff --git a/e2e/old-arch/panels-suite/panelEdit_queries.spec.ts b/e2e/old-arch/panels-suite/panelEdit_queries.spec.ts
index 1700a00ea9f..2e320699497 100644
--- a/e2e/old-arch/panels-suite/panelEdit_queries.spec.ts
+++ b/e2e/old-arch/panels-suite/panelEdit_queries.spec.ts
@@ -35,7 +35,10 @@ describe('Panel edit tests - queries', () => {
     e2e.components.QueryEditorRows.rows({ timeout: flakyTimeout }).should('have.length', 1);
 
     // Duplicate refId B
-    e2e.components.QueryEditorRow.actionButton('Duplicate query').eq(0).should('be.visible').click();
+    // Open the actions menu
+    e2e.components.QueryEditorRow.actionButton('Query actions menu').eq(0).should('be.visible').click();
+    // Click duplicate query in the menu
+    cy.contains('Duplicate query').should('be.visible').click();
 
     // We expect row with refId Band and A to exist and be visible
     e2e.components.QueryEditorRows.rows().should('have.length', 2);