diff --git a/webapp/channels/src/components/admin_console/team_channel_settings/group/group_users/__snapshots__/users_to_remove_groups.test.tsx.snap b/webapp/channels/src/components/admin_console/team_channel_settings/group/group_users/__snapshots__/users_to_remove_groups.test.tsx.snap
index b2a561d24e..184709c313 100644
--- a/webapp/channels/src/components/admin_console/team_channel_settings/group/group_users/__snapshots__/users_to_remove_groups.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/team_channel_settings/group/group_users/__snapshots__/users_to_remove_groups.test.tsx.snap
@@ -28,22 +28,10 @@ exports[`components/admin_console/team_channel_settings/group/UsersToRemoveGroup
 <div
   className="UsersToRemoveGroups"
 >
-  <OverlayTrigger
-    defaultOverlayShown={false}
-    overlay={
-      <Tooltip
-        id="groupsTooltip"
-      >
-        group1, group2, group3
-      </Tooltip>
-    }
+  <WithTooltip
+    id="groupsTooltip"
     placement="bottom"
-    trigger={
-      Array [
-        "hover",
-        "focus",
-      ]
-    }
+    title="group1, group2, group3"
   >
     <a
       href="#"
@@ -58,6 +46,6 @@ exports[`components/admin_console/team_channel_settings/group/UsersToRemoveGroup
         }
       />
     </a>
-  </OverlayTrigger>
+  </WithTooltip>
 </div>
 `;
diff --git a/webapp/channels/src/components/admin_console/team_channel_settings/group/group_users/users_to_remove_groups.tsx b/webapp/channels/src/components/admin_console/team_channel_settings/group/group_users/users_to_remove_groups.tsx
index d56ae7a3e3..4d74343aae 100644
--- a/webapp/channels/src/components/admin_console/team_channel_settings/group/group_users/users_to_remove_groups.tsx
+++ b/webapp/channels/src/components/admin_console/team_channel_settings/group/group_users/users_to_remove_groups.tsx
@@ -7,8 +7,7 @@ import {FormattedMessage} from 'react-intl';
 import type {Group} from '@mattermost/types/groups';
 import type {UserProfile} from '@mattermost/types/users';
 
-import OverlayTrigger from 'components/overlay_trigger';
-import Tooltip from 'components/tooltip';
+import WithTooltip from 'components/with_tooltip';
 
 type ProfileWithGroups = Partial<UserProfile & {
     groups: Array<Partial<Group>>;
@@ -36,17 +35,16 @@ export default function UsersToRemoveGroups(props: UsersToRemoveGroupsProps): JS
     } else if (groups.length === 0) {
         column = message;
     } else {
-        const tooltip = <Tooltip id='groupsTooltip'>{groups.map((g) => g.display_name).join(', ')}</Tooltip>;
+        const tooltip = groups.map((g) => g.display_name).join(', ');
 
         column = (
-            <OverlayTrigger
+            <WithTooltip
+                id='groupsTooltip'
                 placement='bottom'
-                overlay={tooltip}
+                title={tooltip}
             >
-                <a href='#'>
-                    {message}
-                </a>
-            </OverlayTrigger>
+                <a href='#'>{message}</a>
+            </WithTooltip>
         );
     }