diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart
index 47fb51235..c7a3ee706 100644
--- a/lib/pages/chat_list/chat_list.dart
+++ b/lib/pages/chat_list/chat_list.dart
@@ -523,6 +523,9 @@ class ChatListController extends State<ChatList>
       // if (event["activeSpaceId"] != null && mounted) {
       if (mounted) {
         setActiveSpace(event["activeSpaceId"]);
+        if (event["activeSpaceId"] != null) {
+          context.go("/rooms/${event["activeSpaceId"]}/details");
+        }
       }
     });
 
diff --git a/lib/pages/new_space/new_space.dart b/lib/pages/new_space/new_space.dart
index e93f28d8e..59818d3b2 100644
--- a/lib/pages/new_space/new_space.dart
+++ b/lib/pages/new_space/new_space.dart
@@ -220,7 +220,6 @@ class NewSpaceController extends State<NewSpace> {
         );
         MatrixState.pangeaController.classController
             .setActiveSpaceIdInChatListController(spaceId);
-        context.go("/rooms/$spaceId/details");
         return;
       }
 
@@ -249,7 +248,6 @@ class NewSpaceController extends State<NewSpace> {
       // context.pop<String>(spaceId);
       MatrixState.pangeaController.classController
           .setActiveSpaceIdInChatListController(spaceId);
-      context.go("/rooms/$spaceId/details");
       // Pangea#
     } catch (e) {
       setState(() {