diff --git a/src/components/datagrid/body/header/data_grid_header_cell.test.tsx b/src/components/datagrid/body/header/data_grid_header_cell.test.tsx
index 109489fedc3..5daee5968ef 100644
--- a/src/components/datagrid/body/header/data_grid_header_cell.test.tsx
+++ b/src/components/datagrid/body/header/data_grid_header_cell.test.tsx
@@ -256,9 +256,19 @@ describe('EuiDataGridHeaderCell', () => {
       fireEvent.click(toggle);
       waitForEuiPopoverOpen();
       expect(mockFocusContext.setFocusedCell).toHaveBeenCalledWith([0, -1]);
+      expect(
+        container.querySelector(
+          '.euiDataGridHeaderCell__button--withOpenPopover'
+        )
+      ).toBeInTheDocument();
 
       fireEvent.click(toggle);
       waitForEuiPopoverClose();
+      expect(
+        container.querySelector(
+          '.euiDataGridHeaderCell__button--withOpenPopover'
+        )
+      ).not.toBeInTheDocument();
     });
 
     describe('keyboard arrow navigation', () => {