diff --git a/imports/NeoChat/Menu/RoomListContextMenu.qml b/imports/NeoChat/Menu/RoomListContextMenu.qml
index de86cd278..60e0ab765 100644
--- a/imports/NeoChat/Menu/RoomListContextMenu.qml
+++ b/imports/NeoChat/Menu/RoomListContextMenu.qml
@@ -44,7 +44,12 @@ Menu {
 
     MenuItem {
         text: i18n("Leave Room")
-        onTriggered: room.forget()
+        onTriggered: {
+            if(roomManager.currentRoom == root.room) {
+                pageStack.pop()
+            }
+            room.forget()
+        }
     }
 
     onClosed: destroy()