diff --git a/web/chat/composed-message.react.js b/web/chat/composed-message.react.js
--- a/web/chat/composed-message.react.js
+++ b/web/chat/composed-message.react.js
@@ -132,9 +132,6 @@
         <MessageActionButtons
           threadInfo={threadInfo}
           item={item}
-          containerPosition={
-            this.props.mouseOverMessagePosition.containerPosition
-          }
           availableTooltipPositions={availableTooltipPositions}
           setMouseOverMessagePosition={this.props.setMouseOverMessagePosition}
           mouseOverMessagePosition={this.props.mouseOverMessagePosition}
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
@@ -20,7 +20,6 @@
   ItemAndContainerPositionInfo,
   MessagePositionInfo,
   OnMessagePositionWithContainerInfo,
-  PositionInfo,
 } from './position-types';
 import { tooltipPositions, type TooltipPosition } from './tooltip-utils';
 import {
@@ -37,12 +36,11 @@
 type MessageActionButtonsProps = {
   +threadInfo: ThreadInfo,
   +item: ChatMessageInfoItem,
-  +containerPosition: PositionInfo,
   +availableTooltipPositions: $ReadOnlyArray<TooltipPosition>,
   +setMouseOverMessagePosition?: (
     messagePositionInfo: MessagePositionInfo,
   ) => void,
-  +mouseOverMessagePosition?: OnMessagePositionWithContainerInfo,
+  +mouseOverMessagePosition: OnMessagePositionWithContainerInfo,
   +canReply?: boolean,
   +inputState?: ?InputState,
 };
@@ -50,7 +48,6 @@
   const {
     threadInfo,
     item,
-    containerPosition,
     availableTooltipPositions,
     setMouseOverMessagePosition,
     mouseOverMessagePosition,
@@ -58,6 +55,8 @@
     inputState,
   } = props;
 
+  const { containerPosition } = mouseOverMessagePosition;
+
   const [tooltipVisible, setTooltipVisible] = React.useState(false);
   const [pointingTo, setPointingTo] = React.useState();
 
diff --git a/web/chat/robotext-message.react.js b/web/chat/robotext-message.react.js
--- a/web/chat/robotext-message.react.js
+++ b/web/chat/robotext-message.react.js
@@ -16,7 +16,7 @@
 import { useSelector } from '../redux/redux-utils';
 import { updateNavInfoActionType } from '../types/nav-types';
 import { InlineSidebar } from './inline-sidebar.react';
-import MessageActionTooltip from './message-action-buttons';
+import MessageActionButtons from './message-action-buttons';
 import type {
   MessagePositionInfo,
   OnMessagePositionWithContainerInfo,
@@ -66,12 +66,10 @@
       sidebarExistsOrCanBeCreated
     ) {
       messageActionTooltip = (
-        <MessageActionTooltip
+        <MessageActionButtons
           threadInfo={threadInfo}
           item={item}
-          containerPosition={
-            this.props.mouseOverMessagePosition.containerPosition
-          }
+          mouseOverMessagePosition={this.props.mouseOverMessagePosition}
           availableTooltipPositions={availableTooltipPositionsForRobotext}
         />
       );