diff --git a/webapp/channels/src/components/threading/global_threads/thread_pane/__snapshots__/thread_pane.test.tsx.snap b/webapp/channels/src/components/threading/global_threads/thread_pane/__snapshots__/thread_pane.test.tsx.snap
index 7c1f389945..e0a0976e6d 100644
--- a/webapp/channels/src/components/threading/global_threads/thread_pane/__snapshots__/thread_pane.test.tsx.snap
+++ b/webapp/channels/src/components/threading/global_threads/thread_pane/__snapshots__/thread_pane.test.tsx.snap
@@ -46,9 +46,10 @@ exports[`components/threading/global_threads/thread_pane should match snapshot 1
           threadId="1y8hpek81byspd4enyk9mp1ncw"
           unreadTimestamp={1611786714912}
         >
-          <SimpleTooltip
-            content="More Actions"
+          <WithTooltip
             id="threadActionMenu"
+            placement="top"
+            title="More Actions"
           >
             <Memo(Button)
               className="Button___icon Button___large"
@@ -57,7 +58,7 @@ exports[`components/threading/global_threads/thread_pane should match snapshot 1
                 size={18}
               />
             </Memo(Button)>
-          </SimpleTooltip>
+          </WithTooltip>
         </Memo(ThreadMenu)>
       </React.Fragment>
     }
diff --git a/webapp/channels/src/components/threading/global_threads/thread_pane/thread_pane.tsx b/webapp/channels/src/components/threading/global_threads/thread_pane/thread_pane.tsx
index d73dd0ad63..6fa24a4b9c 100644
--- a/webapp/channels/src/components/threading/global_threads/thread_pane/thread_pane.tsx
+++ b/webapp/channels/src/components/threading/global_threads/thread_pane/thread_pane.tsx
@@ -14,7 +14,7 @@ import {makeGetChannel} from 'mattermost-redux/selectors/entities/channels';
 import {getPost, makeGetPostsForThread} from 'mattermost-redux/selectors/entities/posts';
 
 import Header from 'components/widgets/header';
-import SimpleTooltip from 'components/widgets/simple_tooltip';
+import WithTooltip from 'components/with_tooltip';
 
 import type {GlobalState} from 'types/store';
 
@@ -119,17 +119,18 @@ const ThreadPane = ({
                             hasUnreads={Boolean(thread.unread_replies || thread.unread_mentions)}
                             unreadTimestamp={unreadTimestamp}
                         >
-                            <SimpleTooltip
+                            <WithTooltip
                                 id='threadActionMenu'
-                                content={formatMessage({
+                                title={formatMessage({
                                     id: 'threading.threadHeader.menu',
                                     defaultMessage: 'More Actions',
                                 })}
+                                placement={'top'}
                             >
                                 <Button className='Button___icon Button___large'>
                                     <DotsVerticalIcon size={18}/>
                                 </Button>
-                            </SimpleTooltip>
+                            </WithTooltip>
                         </ThreadMenu>
                     </>
                 )}