diff --git a/src/components/list_group/__snapshots__/list_group_item.test.tsx.snap b/src/components/list_group/__snapshots__/list_group_item.test.tsx.snap
index 604f2a99529..8c9b127f0a2 100644
--- a/src/components/list_group/__snapshots__/list_group_item.test.tsx.snap
+++ b/src/components/list_group/__snapshots__/list_group_item.test.tsx.snap
@@ -70,36 +70,6 @@ exports[`EuiListGroupItem props color text is rendered 1`] = `
 </li>
 `;
 
-exports[`EuiListGroupItem props extraAction can be disabled 1`] = `
-<li
-  class="euiListGroupItem emotion-euiListGroupItem-m"
->
-  <span
-    class="euiListGroupItem__text emotion-euiListGroupItem__inner-m-text"
-  >
-    <span
-      class="euiListGroupItem__label emotion-euiListGroupItem__label-truncate"
-      title="Label"
-    >
-      Label
-    </span>
-  </span>
-  <button
-    aria-label="label"
-    class="euiButtonIcon euiListGroupItemExtraAction emotion-euiButtonIcon-xs-empty-disabled-isDisabled-euiListGroupItemExtraAction-hoverStyles"
-    disabled=""
-    type="button"
-  >
-    <span
-      aria-hidden="true"
-      class="euiButtonIcon__icon"
-      color="inherit"
-      data-euiicon-type="empty"
-    />
-  </button>
-</li>
-`;
-
 exports[`EuiListGroupItem props extraAction is rendered 1`] = `
 <li
   class="euiListGroupItem emotion-euiListGroupItem-m"
diff --git a/src/components/list_group/list_group_item.test.tsx b/src/components/list_group/list_group_item.test.tsx
index 17ad96829bf..db39c4c750e 100644
--- a/src/components/list_group/list_group_item.test.tsx
+++ b/src/components/list_group/list_group_item.test.tsx
@@ -160,19 +160,37 @@ describe('EuiListGroupItem', () => {
         expect(container.firstChild).toMatchSnapshot();
       });
 
+      test('is rendered with showToolTip', () => {
+        const { getByTestSubject } = render(
+          <EuiListGroupItem
+            label="Label"
+            showToolTip
+            extraAction={{
+              iconType: 'empty',
+              alwaysShow: true,
+              'aria-label': 'label',
+              'data-test-subj': 'extraAction',
+            }}
+          />
+        );
+
+        expect(getByTestSubject('extraAction')).toBeInTheDocument();
+      });
+
       test('can be disabled', () => {
-        const { container } = render(
+        const { getByTestSubject } = render(
           <EuiListGroupItem
             label="Label"
             extraAction={{
               iconType: 'empty',
               isDisabled: true,
               'aria-label': 'label',
+              'data-test-subj': 'extraAction',
             }}
           />
         );
 
-        expect(container.firstChild).toMatchSnapshot();
+        expect(getByTestSubject('extraAction')).toBeDisabled();
       });
     });
 
diff --git a/src/components/list_group/list_group_item.tsx b/src/components/list_group/list_group_item.tsx
index cab136d1ed5..fb44067c111 100644
--- a/src/components/list_group/list_group_item.tsx
+++ b/src/components/list_group/list_group_item.tsx
@@ -352,7 +352,10 @@ export const EuiListGroupItem: FunctionComponent<EuiListGroupItemProps> = ({
           anchorClassName={anchorClasses}
           anchorProps={anchorPropsAndCss}
         >
-          {itemContent}
+          <>
+            {itemContent}
+            {extraActionNode}
+          </>
         </EuiToolTip>
       </li>
     );
diff --git a/upcoming_changelogs/7159.md b/upcoming_changelogs/7159.md
new file mode 100644
index 00000000000..c848a260326
--- /dev/null
+++ b/upcoming_changelogs/7159.md
@@ -0,0 +1,3 @@
+**Bug fixes**
+
+- Fixed `EuiListGroupItem` to correctly render the `extraAction` button when `showToolTip` is also passed