diff --git a/resources/qml/RoomList.qml b/resources/qml/RoomList.qml
index d3cc7aeefcabeba5af73761e84f716d60686493f..3d17b4ae9ce44080d71a80f40815bfe1989257b1 100644
--- a/resources/qml/RoomList.qml
+++ b/resources/qml/RoomList.qml
@@ -143,6 +143,10 @@ Page {
             ToolTip.text: roomName
             onClicked: {
                 console.log("tapped " + roomId);
+
+                if (isSpace && Communities.currentTagId != "space:"+roomId)
+                    Communities.currentTagId = "space:"+roomId;
+
                 if (!Rooms.currentRoom || Rooms.currentRoom.roomId !== roomId)
                     Rooms.setCurrentRoom(roomId);
                 else