diff --git a/internal/tui/components/dialogs/commands/commands.go b/internal/tui/components/dialogs/commands/commands.go
index 0b662b8538db04be6c9dc1d01bcbf8d786c54c31..17bd9faaec2227a8badb60347b6f2f25847f1e66 100644
--- a/internal/tui/components/dialogs/commands/commands.go
+++ b/internal/tui/components/dialogs/commands/commands.go
@@ -168,17 +168,10 @@ func (c *commandDialogCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 }
 
 func (c *commandDialogCmp) next() CommandType {
-	switch c.selected {
-	case SystemCommands:
-		if len(c.userCommands) > 0 {
-			return UserCommands
-		}
-		fallthrough
-	case UserCommands:
-		fallthrough
-	default:
-		return SystemCommands
+	if c.selected == SystemCommands {
+		return UserCommands
 	}
+	return SystemCommands
 }
 
 func (c *commandDialogCmp) View() string {