diff --git a/src/components/datagrid/_data_grid_data_row.scss b/src/components/datagrid/_data_grid_data_row.scss
index bf027b52bb7..0c67342deff 100644
--- a/src/components/datagrid/_data_grid_data_row.scss
+++ b/src/components/datagrid/_data_grid_data_row.scss
@@ -128,6 +128,10 @@
     flex-grow: 1;
   }
 
+  .euiDataGridRowCell__actions {
+    flex-grow: 0;
+  }
+
   .euiDataGridRowCell--controlColumn & {
     height: 100%;
     align-items: center;
@@ -137,16 +141,14 @@
 // Cell actions
 .euiDataGridRowCell__actions {
   display: flex;
-}
-.euiDataGridRowCell__actions--flex {
-  flex-grow: 0;
-}
-.euiDataGridRowCell__actions--overlay {
-  position: absolute;
-  right: 0;
-  top: 0;
-  padding: $euiDataGridCellPaddingM 0;
-  background-color: $euiColorEmptyShade;
+
+  &--overlay {
+    position: absolute;
+    right: 0;
+    top: 0;
+    padding: $euiDataGridCellPaddingM 0;
+    background-color: $euiColorEmptyShade;
+  }
 }
 
 .euiDataGridRowCell__actionButtonIcon {
@@ -228,7 +230,7 @@
     padding: ($euiDataGridCellPaddingS / 2) 0;
   }
 
-  .euiDataGridRowCell__actions--flex {
+  .euiDataGridRowCell__defaultHeight .euiDataGridRowCell__actions {
     transform: translateY(1px);
   }
 }
diff --git a/src/components/datagrid/body/data_grid_cell_actions.test.tsx b/src/components/datagrid/body/data_grid_cell_actions.test.tsx
index 3b2a11b026b..151f3003814 100644
--- a/src/components/datagrid/body/data_grid_cell_actions.test.tsx
+++ b/src/components/datagrid/body/data_grid_cell_actions.test.tsx
@@ -33,7 +33,7 @@ describe('EuiDataGridCellActions', () => {
 
     expect(component).toMatchInlineSnapshot(`
       <div
-        className="euiDataGridRowCell__actions euiDataGridRowCell__actions--flex"
+        className="euiDataGridRowCell__actions"
       >
         <EuiI18n
           default="Click or hit enter to interact with cell content"
@@ -90,7 +90,7 @@ describe('EuiDataGridCellActions', () => {
 
     expect(component).toMatchInlineSnapshot(`
       <div
-        className="euiDataGridRowCell__actions euiDataGridRowCell__actions--flex"
+        className="euiDataGridRowCell__actions"
       >
         <MockAction
           Component={[Function]}
diff --git a/src/components/datagrid/body/data_grid_cell_actions.tsx b/src/components/datagrid/body/data_grid_cell_actions.tsx
index 4e7d9830a9f..bc3ed204dfe 100644
--- a/src/components/datagrid/body/data_grid_cell_actions.tsx
+++ b/src/components/datagrid/body/data_grid_cell_actions.tsx
@@ -95,7 +95,6 @@ export const EuiDataGridCellActions = ({
   }, [column, colIndex, rowIndex]);
 
   const classes = classNames('euiDataGridRowCell__actions', {
-    'euiDataGridRowCell__actions--flex': cellHeightType === 'default',
     'euiDataGridRowCell__actions--overlay': cellHeightType !== 'default',
   });