From dc95024b2c5affc9003e255c6b818089a1a5a7c2 Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Thu, 4 Dec 2025 15:19:45 -0500
Subject: [PATCH] fix

---
 lib/widgets/chat_page/sidebar.dart | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/widgets/chat_page/sidebar.dart b/lib/widgets/chat_page/sidebar.dart
index 423300b..29ef4bc 100644
--- a/lib/widgets/chat_page/sidebar.dart
+++ b/lib/widgets/chat_page/sidebar.dart
@@ -44,7 +44,7 @@ class Sidebar extends HookConsumerWidget {
                     (space) => space.id == selectedSpace,
                   );
                   final selectedIndex = indexOfSelected == -1
-                      ? null
+                      ? 0
                       : indexOfSelected;
 
                   return NavigationRail(
@@ -116,7 +116,9 @@ class Sidebar extends HookConsumerWidget {
                       (room) => room.roomData.id == selectedRoom,
                     );
                     final selectedIndex = indexOfSelected == -1
-                        ? null
+                        ? space.children.isEmpty
+                              ? null
+                              : 0
                         : indexOfSelected;
 
                     return Scaffold(