diff --git a/lib/pages/chat_list/chat_list_body.dart b/lib/pages/chat_list/chat_list_body.dart
index c142d4d0c2..b54c02ca25 100644
--- a/lib/pages/chat_list/chat_list_body.dart
+++ b/lib/pages/chat_list/chat_list_body.dart
@@ -170,7 +170,16 @@ class ChatListViewBody extends StatelessWidget {
                         ),
                       ),
                     ),
-                    if (client.rooms.isNotEmpty && !controller.isSearchMode)
+                    // #Pangea
+                    if (!controller.isSearchMode)
+
+                      // if (client.rooms.isNotEmpty && !controller.isSearchMode)
+                      // let's simplify this UI while the user has less chat than
+                      // can fill this view
+                      if (client.rooms.length <= 7 || controller.isSearchMode)
+                        const SizedBox(height: 8),
+                    if (client.rooms.length > 7 && !controller.isSearchMode)
+                      // Pangea#
                       SizedBox(
                         height: 64,
                         child: ListView(