diff --git a/internal/tui/components/dialogs/models/models.go b/internal/tui/components/dialogs/models/models.go
index 406f4a5853a88bfb22914071e7e53d19662b7ecd..820c8b0fa3c574521ed773f62032e2e7cb6747d1 100644
--- a/internal/tui/components/dialogs/models/models.go
+++ b/internal/tui/components/dialogs/models/models.go
@@ -154,11 +154,9 @@ func (m *modelDialogCmp) Update(msg tea.Msg) (util.Model, tea.Cmd) {
 					util.ReportInfo("URL copied to clipboard"),
 				)
 			}
-		case key.Matches(msg, m.keyMap.Choose):
-			if m.showClaudeAuthMethodChooser {
-				m.claudeAuthMethodChooser.ToggleChoice()
-				return m, nil
-			}
+		case key.Matches(msg, m.keyMap.Choose) && m.showClaudeAuthMethodChooser:
+			m.claudeAuthMethodChooser.ToggleChoice()
+			return m, nil
 		case key.Matches(msg, m.keyMap.Select):
 			selectedItem := m.modelList.SelectedModel()