diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart
index e6c260da1..955d4bf90 100644
--- a/lib/pages/chat_list/chat_list.dart
+++ b/lib/pages/chat_list/chat_list.dart
@@ -115,6 +115,15 @@ class ChatListController extends State<ChatList>
     }
   }
 
+  // #Pangea
+  bool isSelected(int i) {
+    if (activeFilter == ActiveFilter.spaces && activeSpaceId != null) {
+      return false;
+    }
+    return i == selectedIndex;
+  }
+  // Pangea#
+
   ActiveFilter getActiveFilterByDestination(int? i) {
     switch (i) {
       case 1:
diff --git a/lib/pages/chat_list/chat_list_view.dart b/lib/pages/chat_list/chat_list_view.dart
index a12611107..04fba6670 100644
--- a/lib/pages/chat_list/chat_list_view.dart
+++ b/lib/pages/chat_list/chat_list_view.dart
@@ -148,7 +148,10 @@ class ChatListView extends StatelessWidget {
                         itemBuilder: (context, i) {
                           if (i < destinations.length) {
                             return NaviRailItem(
-                              isSelected: i == controller.selectedIndex,
+                              // #Pangea
+                              // isSelected: i == controller.selectedIndex,
+                              isSelected: controller.isSelected(i),
+                              // Pangea#
                               onTap: () => controller.onDestinationSelected(i),
                               icon: destinations[i].icon,
                               selectedIcon: destinations[i].selectedIcon,