diff --git a/lib/pages/chat_list/chat_list_body.dart b/lib/pages/chat_list/chat_list_body.dart
index 7060bd3f6..8170732c2 100644
--- a/lib/pages/chat_list/chat_list_body.dart
+++ b/lib/pages/chat_list/chat_list_body.dart
@@ -35,6 +35,7 @@ class ChatListViewBody extends StatelessWidget {
     final activeSpace = controller.activeSpaceId;
     if (activeSpace != null) {
       return SpaceView(
+        key: ValueKey(activeSpace),
         spaceId: activeSpace,
         onBack: controller.clearActiveSpace,
         onChatTab: (room) => controller.onChatTap(room),
diff --git a/lib/pages/chat_list/space_view.dart b/lib/pages/chat_list/space_view.dart
index ad985d198..639bd1b90 100644
--- a/lib/pages/chat_list/space_view.dart
+++ b/lib/pages/chat_list/space_view.dart
@@ -324,8 +324,8 @@ class _SpaceViewState extends State<SpaceView> {
               true
           ? FloatingActionButton.extended(
               onPressed: _addChatOrSubspace,
-              label: Text(L10n.of(context).chat),
-              icon: const Icon(Icons.chat_outlined),
+              label: Text(L10n.of(context).group),
+              icon: const Icon(Icons.group_add_outlined),
             )
           : null,
       body: room == null
@@ -436,20 +436,8 @@ class _SpaceViewState extends State<SpaceView> {
                       },
                     ),
                     SliverList.builder(
-                      itemCount: joinedRooms.length + 1,
+                      itemCount: joinedRooms.length,
                       itemBuilder: (context, i) {
-                        if (i == 0) {
-                          return Column(
-                            mainAxisSize: MainAxisSize.min,
-                            children: [
-                              SearchTitle(
-                                title: L10n.of(context).joinedChats,
-                                icon: const Icon(Icons.chat_outlined),
-                              ),
-                            ],
-                          );
-                        }
-                        i--;
                         final joinedRoom = joinedRooms[i];
                         return ChatListItem(
                           joinedRoom,
@@ -569,6 +557,7 @@ class _SpaceViewState extends State<SpaceView> {
                         );
                       },
                     ),
+                    const SliverPadding(padding: EdgeInsets.only(top: 32)),
                   ],
                 );
               },