diff --git a/src/main.zig b/src/main.zig
index e1a13a7..f1d7c4a 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -529,7 +529,7 @@ pub fn main() !void {
 
             active_input = .password;
 
-            if (user.session_index < session.label.list.items.len) session.label.current = user.session_index;
+            session.label.current = @min(user.session_index, session.label.list.items.len - 1);
         }
     }
 
diff --git a/src/tui/components/UserList.zig b/src/tui/components/UserList.zig
index d9ed846..91ddc15 100644
--- a/src/tui/components/UserList.zig
+++ b/src/tui/components/UserList.zig
@@ -71,8 +71,7 @@ pub fn getCurrentUsername(self: UserList) []const u8 {
 
 fn usernameChanged(user: User, maybe_session: ?*Session) void {
     if (maybe_session) |session| {
-        if (user.session_index.* >= session.label.list.items.len) return;
-        session.label.current = user.session_index.*;
+        session.label.current = @min(user.session_index.*, session.label.list.items.len - 1);
     }
 }