diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart
index 955d4bf90..e7de171f7 100644
--- a/lib/pages/chat_list/chat_list.dart
+++ b/lib/pages/chat_list/chat_list.dart
@@ -149,6 +149,13 @@ class ChatListController extends State<ChatList>
       // Pangea#
       activeFilter = getActiveFilterByDestination(i);
     });
+    // #Pangea
+    final bool clickedAllSpaces = (!AppConfig.separateChatTypes && i == 1) ||
+        (AppConfig.separateChatTypes && i == 2);
+    if (clickedAllSpaces) {
+      setActiveSpace(null);
+    }
+    // Pangea#
   }
 
   ActiveFilter activeFilter = AppConfig.separateChatTypes