diff --git a/src/components/room/RoomChatPanel.tsx b/src/components/room/RoomChatPanel.tsx
index e27cc18..fcfe7e4 100644
--- a/src/components/room/RoomChatPanel.tsx
+++ b/src/components/room/RoomChatPanel.tsx
@@ -161,6 +161,15 @@ const ChatInputArea = memo(function ChatInputArea({
     }, 0);
   }, [draft, ms]);
 
+  // ─── Auto-show/hide popover when @ context appears ────────────────────
+  useEffect(() => {
+    if (ms.mentionState && !ms.showMentionPopover) {
+      ms.setShowMentionPopover(true);
+    } else if (!ms.mentionState && ms.showMentionPopover) {
+      ms.setShowMentionPopover(false);
+    }
+  }, [ms.mentionState, ms.showMentionPopover, ms.setShowMentionPopover]);
+
   // ─── mention-click handler (from message mentions) ─────────────────────
   useEffect(() => {
     const onMentionClick = (e: Event) => {