diff --git a/x-pack/plugins/osquery/cypress/tasks/saved_queries.ts b/x-pack/plugins/osquery/cypress/tasks/saved_queries.ts
index 0ff06beed1d79..568649572ae99 100644
--- a/x-pack/plugins/osquery/cypress/tasks/saved_queries.ts
+++ b/x-pack/plugins/osquery/cypress/tasks/saved_queries.ts
@@ -52,15 +52,17 @@ export const getSavedQueriesComplexTest = () =>
 
         // hidden columns
         cy.getBySel(RESULTS_TABLE_COLUMNS_BUTTON).should('have.text', 'Columns35');
-        cy.getBySel('dataGridHeaderCell-osquery.cmdline').click();
-        cy.contains(/Hide column$/).click();
-        cy.getBySel('dataGridHeaderCell-osquery.cwd').click();
-
-        cy.contains(/Hide column$/).click();
-        cy.getBySel('dataGridHeaderCell-osquery.disk_bytes_written.number').click();
-
-        cy.contains(/Hide column$/).click();
+        cy.getBySel('dataGridColumnSelectorButton').click();
+        cy.get('[data-popover-open="true"]').should('be.visible');
+        cy.getBySel('dataGridColumnSelectorToggleColumnVisibility-osquery.cmdline').click();
+        cy.getBySel('dataGridColumnSelectorToggleColumnVisibility-osquery.cwd').click();
+        cy.getBySel(
+          'dataGridColumnSelectorToggleColumnVisibility-osquery.disk_bytes_written.number'
+        ).click();
+        cy.getBySel('dataGridColumnSelectorButton').click();
+        cy.get('[data-popover-open="true"]').should('not.exist');
         cy.getBySel(RESULTS_TABLE_COLUMNS_BUTTON).should('have.text', 'Columns32/35');
+
         // change pagination
         cy.getBySel('pagination-button-next').click().wait(500).click();
         cy.getBySel(RESULTS_TABLE_COLUMNS_BUTTON).should('have.text', 'Columns32/35');
@@ -72,8 +74,7 @@ export const getSavedQueriesComplexTest = () =>
         cy.getBySel(RESULTS_TABLE_BUTTON).click();
 
         // sorting
-        cy.getBySel('dataGridHeaderCell-osquery.egid').click();
-
+        cy.getBySel('dataGridHeaderCellActionButton-osquery.egid').click({ force: true });
         cy.contains(/Sort A-Z$/).click();
         cy.getBySel(RESULTS_TABLE_COLUMNS_BUTTON).should('have.text', 'Columns32/35');
         cy.getBySel(RESULTS_TABLE_BUTTON).trigger('mouseover');