diff --git a/web/chat/message-action-buttons.js b/web/chat/message-action-buttons.js
--- a/web/chat/message-action-buttons.js
+++ b/web/chat/message-action-buttons.js
@@ -18,7 +18,11 @@
   PositionInfo,
 } from './position-types';
 import { tooltipPositions, type TooltipPosition } from './tooltip-utils';
-import { TooltipMenu, type TooltipStyle, TooltipButton } from './tooltip.react';
+import {
+  TooltipMenu,
+  type TooltipStyle,
+  TooltipTextItem,
+} from './tooltip.react';
 
 const messageActionIconExcessVerticalWhitespace = 10;
 
@@ -107,10 +111,7 @@
         layoutPosition="relative"
         getStyle={getMessageActionTooltipStyle}
       >
-        <TooltipButton
-          text={sidebarTooltipButtonText}
-          onClick={onSidebarButtonClick}
-        />
+        <TooltipTextItem text={sidebarTooltipButtonText} />
       </TooltipMenu>
     );
   }
@@ -120,7 +121,8 @@
       <div
         className={css.messageActionLinkIcon}
         onMouseLeave={hideTooltip}
-        onClick={toggleTooltip}
+        onClick={onSidebarButtonClick}
+        onMouseEnter={toggleTooltip}
       >
         <SWMansionIcon icon="message-circle-lines" size={18} />
         {tooltipMenu}