From d2348d2ea23bd3cf0939aae63bf79576417fdc7d Mon Sep 17 00:00:00 2001
From: hazre <mail@haz.re>
Date: Fri, 13 Feb 2026 10:20:42 +0100
Subject: [PATCH 1/2] fix: preserve navigation context when opening non-call
 rooms

---
 src/app/features/room-nav/RoomNavItem.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/features/room-nav/RoomNavItem.tsx b/src/app/features/room-nav/RoomNavItem.tsx
index 03c2d169..a8e35fbf 100644
--- a/src/app/features/room-nav/RoomNavItem.tsx
+++ b/src/app/features/room-nav/RoomNavItem.tsx
@@ -302,7 +302,7 @@ export function RoomNavItem({
         navigateRoom(room.roomId);
       }
     } else {
-      navigateRoom(room.roomId);
+      navigate(linkPath);
     }
   };
 

From 23b1216e372f897a282b2222bfc7f55e0e825c3e Mon Sep 17 00:00:00 2001
From: hazre <mail@haz.re>
Date: Fri, 13 Feb 2026 10:21:12 +0100
Subject: [PATCH 2/2] fix: reset room name state when room instance changes

---
 src/app/hooks/useRoomMeta.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/app/hooks/useRoomMeta.ts b/src/app/hooks/useRoomMeta.ts
index 8b0ae8cc..086c3a56 100644
--- a/src/app/hooks/useRoomMeta.ts
+++ b/src/app/hooks/useRoomMeta.ts
@@ -20,6 +20,8 @@ export const useRoomName = (room: Room): string => {
   const [name, setName] = useState(room.name);
 
   useEffect(() => {
+    setName(room.name);
+
     const handleRoomNameChange: RoomEventHandlerMap[RoomEvent.Name] = () => {
       setName(room.name);
     };