diff --git a/src/app/qml/AvatarTabButton.qml b/src/app/qml/AvatarTabButton.qml
index 12bfcc79a..31b76a9b1 100644
--- a/src/app/qml/AvatarTabButton.qml
+++ b/src/app/qml/AvatarTabButton.qml
@@ -48,6 +48,7 @@ Delegates.RoundedItemDelegate {
 
     TapHandler {
         acceptedDevices: PointerDevice.TouchScreen
+        onTapped: root.selected()
         onLongPressed: root.contextMenuRequested()
     }
 
diff --git a/src/app/roommanager.cpp b/src/app/roommanager.cpp
index 00c15a2f2..9964f1340 100644
--- a/src/app/roommanager.cpp
+++ b/src/app/roommanager.cpp
@@ -540,7 +540,9 @@ void RoomManager::setCurrentSpace(const QString &spaceId, bool setRoom)
 
         const auto &lastRoom = m_lastRoomConfig.readEntry(configSpaceId, QString());
         if (lastRoom.isEmpty()) {
-            resolveResource(spaceId, "no_join"_L1);
+            if (spaceId != u"DM"_s) {
+                resolveResource(spaceId, "no_join"_L1);
+            }
         } else {
             resolveResource(lastRoom, "no_join"_L1);
         }