diff --git a/src/app/features/room/RoomInput.tsx b/src/app/features/room/RoomInput.tsx
index 89169afc..ad3dbf60 100644
--- a/src/app/features/room/RoomInput.tsx
+++ b/src/app/features/room/RoomInput.tsx
@@ -222,6 +222,11 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
     // top of the composer instead of floating as a pop-out.
     const dockEmojiBoard = mobileOrTablet() || screenSize === ScreenSize.Mobile;
     const [emojiBoardTab, setEmojiBoardTab] = useState<EmojiBoardTab | undefined>(undefined);
+    // Crossing the dock/pop-out breakpoint remounts the trigger; drop any open
+    // dock state so the board doesn't silently re-open after a resize round-trip.
+    useEffect(() => {
+      setEmojiBoardTab(undefined);
+    }, [dockEmojiBoard]);
     const roomToParents = useAtomValue(roomToParentsAtom);
     const powerLevels = usePowerLevelsContext();
     const creators = useRoomCreators(room);