diff --git a/src/components/basic_table/__snapshots__/basic_table.test.tsx.snap b/src/components/basic_table/__snapshots__/basic_table.test.tsx.snap
index 907f7e46a2b..a5a2a0f910d 100644
--- a/src/components/basic_table/__snapshots__/basic_table.test.tsx.snap
+++ b/src/components/basic_table/__snapshots__/basic_table.test.tsx.snap
@@ -1723,6 +1723,7 @@ exports[`EuiBasicTable with multiple record actions with custom availability 1`]
           </EuiTableRowCell>
           <EuiTableRowCell
             align="right"
+            css="unknown styles"
             hasActions={true}
             key="record_actions_1_1"
             showOnHover={true}
@@ -1784,6 +1785,7 @@ exports[`EuiBasicTable with multiple record actions with custom availability 1`]
           </EuiTableRowCell>
           <EuiTableRowCell
             align="right"
+            css="unknown styles"
             hasActions={true}
             key="record_actions_2_1"
             showOnHover={true}
@@ -1846,6 +1848,7 @@ exports[`EuiBasicTable with multiple record actions with custom availability 1`]
           </EuiTableRowCell>
           <EuiTableRowCell
             align="right"
+            css="unknown styles"
             hasActions={true}
             key="record_actions_3_1"
             showOnHover={true}
@@ -1903,6 +1906,7 @@ exports[`EuiBasicTable with multiple record actions with custom availability 1`]
           </EuiTableRowCell>
           <EuiTableRowCell
             align="right"
+            css="unknown styles"
             hasActions={true}
             key="record_actions_4_1"
             showOnHover={true}
@@ -3023,6 +3027,7 @@ exports[`EuiBasicTable with pagination, selection, sorting and a single record a
           </EuiTableRowCell>
           <EuiTableRowCell
             align="right"
+            css="unknown styles"
             hasActions={true}
             key="record_actions_1_1"
             showOnHover={true}
@@ -3081,6 +3086,7 @@ exports[`EuiBasicTable with pagination, selection, sorting and a single record a
           </EuiTableRowCell>
           <EuiTableRowCell
             align="right"
+            css="unknown styles"
             hasActions={true}
             key="record_actions_2_1"
             showOnHover={true}
@@ -3139,6 +3145,7 @@ exports[`EuiBasicTable with pagination, selection, sorting and a single record a
           </EuiTableRowCell>
           <EuiTableRowCell
             align="right"
+            css="unknown styles"
             hasActions={true}
             key="record_actions_3_1"
             showOnHover={true}
@@ -3707,6 +3714,7 @@ exports[`EuiBasicTable with pagination, selection, sorting and multiple record a
           </EuiTableRowCell>
           <EuiTableRowCell
             align="right"
+            css="unknown styles"
             hasActions={true}
             key="record_actions_1_1"
             showOnHover={true}
@@ -3771,6 +3779,7 @@ exports[`EuiBasicTable with pagination, selection, sorting and multiple record a
           </EuiTableRowCell>
           <EuiTableRowCell
             align="right"
+            css="unknown styles"
             hasActions={true}
             key="record_actions_2_1"
             showOnHover={true}
@@ -3835,6 +3844,7 @@ exports[`EuiBasicTable with pagination, selection, sorting and multiple record a
           </EuiTableRowCell>
           <EuiTableRowCell
             align="right"
+            css="unknown styles"
             hasActions={true}
             key="record_actions_3_1"
             showOnHover={true}
diff --git a/src/components/basic_table/basic_table.styles.ts b/src/components/basic_table/basic_table.styles.ts
new file mode 100644
index 00000000000..271aea32657
--- /dev/null
+++ b/src/components/basic_table/basic_table.styles.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { css } from '@emotion/react';
+
+// Unsets the extra height caused by tooltip/popover wrappers around table action buttons
+// Without this, the row height jumps whenever actions are disabled
+export const euiBasicTableActionsWrapper = css`
+  line-height: 1;
+`;
diff --git a/src/components/basic_table/basic_table.tsx b/src/components/basic_table/basic_table.tsx
index 9454a779b75..f13f63bac11 100644
--- a/src/components/basic_table/basic_table.tsx
+++ b/src/components/basic_table/basic_table.tsx
@@ -66,6 +66,8 @@ import {
 } from './table_types';
 import { EuiTableSortMobileProps } from '../table/mobile/table_sort_mobile';
 
+import { euiBasicTableActionsWrapper } from './basic_table.styles';
+
 type DataTypeProfiles = Record<
   EuiTableDataType,
   {
@@ -1214,6 +1216,7 @@ export class EuiBasicTable<T = any> extends Component<
         align="right"
         textOnly={false}
         hasActions={true}
+        css={euiBasicTableActionsWrapper}
       >
         {tools}
       </EuiTableRowCell>
diff --git a/upcoming_changelogs/6538.md b/upcoming_changelogs/6538.md
new file mode 100644
index 00000000000..d30c638b1c9
--- /dev/null
+++ b/upcoming_changelogs/6538.md
@@ -0,0 +1,3 @@
+**Bug fixes**
+
+- Fixed slight row height jumping in `EuiBasicTable`s when actions with tooltips became disabled