diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart
index 1a6d09373..188b0297e 100644
--- a/lib/pages/chat_list/chat_list.dart
+++ b/lib/pages/chat_list/chat_list.dart
@@ -127,9 +127,17 @@ class ChatListController extends State<ChatList>
     // Pangea#
   }
 
-  void clearActiveSpace() => setState(() {
-        _activeSpaceId = null;
-      });
+  // #Pangea
+  // void clearActiveSpace() => setState(() {
+  //       _activeSpaceId = null;
+  //     });
+  void clearActiveSpace() {
+    setState(() {
+      _activeSpaceId = null;
+    });
+    context.go("/rooms");
+  }
+  // Pangea#
 
   void onChatTap(Room room) async {
     if (room.membership == Membership.invite) {
diff --git a/pubspec.lock b/pubspec.lock
index 3fa9dd08e..276af5526 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1481,7 +1481,7 @@ packages:
     description:
       path: "."
       ref: main
-      resolved-ref: "59895c358743fa23d8b52a61a8ec9755139951f8"
+      resolved-ref: cbba79b42dba2a6f5b17880a95906a2602b9a0ff
       url: "https://github.com/pangeachat/matrix-dart-sdk.git"
     source: git
     version: "0.32.4"