diff --git a/webapp/channels/src/components/create_team/components/team_url/__snapshots__/team_url.test.tsx.snap b/webapp/channels/src/components/create_team/components/team_url/__snapshots__/team_url.test.tsx.snap
index 5c42ebdf78..ae922ac850 100644
--- a/webapp/channels/src/components/create_team/components/team_url/__snapshots__/team_url.test.tsx.snap
+++ b/webapp/channels/src/components/create_team/components/team_url/__snapshots__/team_url.test.tsx.snap
@@ -27,30 +27,17 @@ exports[`/components/create_team/components/display_name should match snapshot 1
           <div
             className="input-group input-group--limit"
           >
-            <OverlayTrigger
-              defaultOverlayShown={false}
-              delayShow={400}
-              overlay={
-                <Tooltip
-                  id="urlTooltip"
-                >
-                  http://localhost:8065/
-                </Tooltip>
-              }
+            <WithTooltip
+              id="urlTooltip"
               placement="top"
-              trigger={
-                Array [
-                  "hover",
-                  "focus",
-                ]
-              }
+              title="http://localhost:8065/"
             >
               <span
                 className="input-group-addon"
               >
                 http://localhost:8065/
               </span>
-            </OverlayTrigger>
+            </WithTooltip>
             <input
               autoFocus={true}
               className="form-control"
diff --git a/webapp/channels/src/components/create_team/components/team_url/team_url.tsx b/webapp/channels/src/components/create_team/components/team_url/team_url.tsx
index bc63db74a0..9838d0a302 100644
--- a/webapp/channels/src/components/create_team/components/team_url/team_url.tsx
+++ b/webapp/channels/src/components/create_team/components/team_url/team_url.tsx
@@ -12,8 +12,7 @@ import type {ActionResult} from 'mattermost-redux/types/actions';
 import {trackEvent} from 'actions/telemetry_actions.jsx';
 
 import ExternalLink from 'components/external_link';
-import OverlayTrigger from 'components/overlay_trigger';
-import Tooltip from 'components/tooltip';
+import WithTooltip from 'components/with_tooltip';
 
 import logoImage from 'images/logo.png';
 import Constants from 'utils/constants';
@@ -197,9 +196,6 @@ export default class TeamUrl extends React.PureComponent<Props, State> {
         }
 
         const title = `${URL.getSiteURL()}/`;
-        const urlTooltip = (
-            <Tooltip id='urlTooltip'>{title}</Tooltip>
-        );
 
         let finishMessage = (
             <FormattedMessage
@@ -236,15 +232,15 @@ export default class TeamUrl extends React.PureComponent<Props, State> {
                         <div className='row'>
                             <div className='col-sm-11'>
                                 <div className='input-group input-group--limit'>
-                                    <OverlayTrigger
-                                        delayShow={Constants.OVERLAY_TIME_DELAY}
-                                        placement='top'
-                                        overlay={urlTooltip}
+                                    <WithTooltip
+                                        id='urlTooltip'
+                                        title={title}
+                                        placement={'top'}
                                     >
                                         <span className='input-group-addon'>
                                             {title}
                                         </span>
-                                    </OverlayTrigger>
+                                    </WithTooltip>
                                     <input
                                         id='teamURLInput'
                                         type='text'