diff --git a/internal/session/session_fork_test.go b/internal/session/session_fork_test.go
index 8712ab63effdc4fb87824e38d2e6c6351a00e73a..99acdb245c6c036a9c38ced674e2f17a58b198fb 100644
--- a/internal/session/session_fork_test.go
+++ b/internal/session/session_fork_test.go
@@ -25,7 +25,7 @@ func TestFork(t *testing.T) {
 	sourceSession, err := svc.Create(ctx, "Source Session")
 	require.NoError(t, err)
 
-	for i := 0; i < 5; i++ {
+	for range 5 {
 		_, err = msgSvc.Create(ctx, sourceSession.ID, message.CreateMessageParams{
 			Role: message.User,
 			Parts: []message.ContentPart{
diff --git a/internal/ui/model/ui.go b/internal/ui/model/ui.go
index 72adc90d9026d197a89cd0216c2a1e279c275251..8ab6cb70771214ef966600c41793c47a03c4f5df 100644
--- a/internal/ui/model/ui.go
+++ b/internal/ui/model/ui.go
@@ -2794,10 +2794,8 @@ func (m *UI) openModelsDialog() tea.Cmd {
 func (m *UI) openCommandsDialog() tea.Cmd {
 	isUserMessageSelected := false
 	selectedItem := m.chat.SelectedItem()
-	if selectedItem != nil {
-		if _, ok := selectedItem.(*chat.UserMessageItem); ok {
-			isUserMessageSelected = true
-		}
+	if _, ok := selectedItem.(*chat.UserMessageItem); ok {
+		isUserMessageSelected = true
 	}
 
 	if m.dialog.ContainsDialog(dialog.CommandsID) {