diff --git a/src/apps/chat/AppChat.tsx b/src/apps/chat/AppChat.tsx
index 6343d0da1..4a8104a46 100644
--- a/src/apps/chat/AppChat.tsx
+++ b/src/apps/chat/AppChat.tsx
@@ -537,6 +537,7 @@ export function AppChat() {
                   capabilityHasT2I={capabilityHasT2I}
                   chatLLMContextTokens={chatLLM?.contextTokens ?? null}
                   fitScreen={isMobile || isMultiPane}
+                  isMobile={isMobile}
                   isMessageSelectionMode={isMessageSelectionMode}
                   setIsMessageSelectionMode={setIsMessageSelectionMode}
                   onConversationBranch={handleConversationBranch}
diff --git a/src/apps/chat/components/ChatMessageList.tsx b/src/apps/chat/components/ChatMessageList.tsx
index 2e49377a2..b1aa66399 100644
--- a/src/apps/chat/components/ChatMessageList.tsx
+++ b/src/apps/chat/components/ChatMessageList.tsx
@@ -34,6 +34,7 @@ export function ChatMessageList(props: {
   capabilityHasT2I: boolean,
   chatLLMContextTokens: number | null,
   fitScreen: boolean,
+  isMobile: boolean,
   isMessageSelectionMode: boolean,
   onConversationBranch: (conversationId: DConversationId, messageId: string) => void,
   onConversationExecuteHistory: (conversationId: DConversationId, history: DMessage[]) => Promise<void>,
@@ -278,6 +279,7 @@ export function ChatMessageList(props: {
               message={message}
               // diffPreviousText={message === diffTargetMessage ? diffPrevText : undefined}
               fitScreen={props.fitScreen}
+              isMobileForAvatar={props.isMobile}
               isBottom={idx === count - 1}
               isImagining={isImagining}
               isSpeaking={isSpeaking}
diff --git a/src/apps/chat/components/message/ChatMessage.tsx b/src/apps/chat/components/message/ChatMessage.tsx
index 7b3b61e02..8d569f836 100644
--- a/src/apps/chat/components/message/ChatMessage.tsx
+++ b/src/apps/chat/components/message/ChatMessage.tsx
@@ -221,6 +221,7 @@ export function ChatMessage(props: {
   message: DMessage,
   diffPreviousText?: string,
   fitScreen: boolean,
+  isMobileForAvatar?: boolean,
   isBottom?: boolean,
   isImagining?: boolean,
   isSpeaking?: boolean,
@@ -589,8 +590,8 @@ export function ChatMessage(props: {
             <Box
               onClick={handleOpsMenuToggle}
               onContextMenu={handleOpsMenuToggle}
-              onMouseEnter={() => setIsHovering(true)}
-              onMouseLeave={() => setIsHovering(false)}
+              onMouseEnter={props.isMobileForAvatar ? undefined : () => setIsHovering(true)}
+              onMouseLeave={props.isMobileForAvatar ? undefined : () => setIsHovering(false)}
               sx={{ display: 'flex' }}
             >
               {(isHovering || opsMenuAnchor) ? (
@@ -856,7 +857,7 @@ export function ChatMessage(props: {
       )}
 
 
-      {/* Selection (Contextual) Menu */}
+      {/* Selection (Right-click) Menu */}
       {!!selMenuAnchor && (
         <CloseableMenu
           dense placement='bottom-start'
diff --git a/src/apps/link-chat/LinkChatViewer.tsx b/src/apps/link-chat/LinkChatViewer.tsx
index 1ad51ad6b..d567357ba 100644
--- a/src/apps/link-chat/LinkChatViewer.tsx
+++ b/src/apps/link-chat/LinkChatViewer.tsx
@@ -137,6 +137,7 @@ export function LinkChatViewer(props: { conversation: DConversation, storedAt: D
                 key={'msg-' + message.id}
                 message={message}
                 fitScreen={isMobile}
+                isMobileForAvatar={isMobile}
                 showBlocksDate={idx === 0 || idx === filteredMessages.length - 1 /* first and last message */}
                 onMessageEdit={(_messageId, text: string) => message.fragments = [createTextContentFragment(text)] /* TODO: replace edit with Content rather than text */}
               />,
diff --git a/src/modules/beam/scatter/BeamScatterInput.tsx b/src/modules/beam/scatter/BeamScatterInput.tsx
index b395f6891..b6f10be75 100644
--- a/src/modules/beam/scatter/BeamScatterInput.tsx
+++ b/src/modules/beam/scatter/BeamScatterInput.tsx
@@ -88,6 +88,7 @@ export function BeamScatterInput(props: {
       <ChatMessageMemo
         message={lastHistoryMessage}
         fitScreen={props.isMobile}
+        isMobileForAvatar={props.isMobile}
         showAvatar={true}
         adjustContentScaling={-1}
         topDecorator={userMessageDecorator}