diff --git a/lib/pages/chat_list/chat_list_body.dart b/lib/pages/chat_list/chat_list_body.dart
index 61e7cdc7..6f374ab5 100644
--- a/lib/pages/chat_list/chat_list_body.dart
+++ b/lib/pages/chat_list/chat_list_body.dart
@@ -136,6 +136,7 @@ class ChatListViewBody extends StatelessWidget {
                           ),
                         if (displayStoriesHeader)
                           StoriesHeader(
+                            key: const Key('stories_header'),
                             filter: controller.searchController.text,
                           ),
                         const ConnectionStatusHeader(),
@@ -197,6 +198,7 @@ class ChatListViewBody extends StatelessWidget {
                   }
                   return ChatListItem(
                     rooms[i],
+                    key: Key('chat_list_item_${rooms[i].id}'),
                     selected: controller.selectedRoomIds.contains(rooms[i].id),
                     onTap: controller.selectMode == SelectMode.select
                         ? () => controller.toggleSelection(rooms[i].id)