From 698b7c8049bd0bb75fccc47c11d472cb500b16ba Mon Sep 17 00:00:00 2001
From: Kujtim Hoxha <kujtimii.h@gmail.com>
Date: Thu, 22 Jan 2026 15:25:17 +0100
Subject: [PATCH] fix: handle new session when focused on the list

---
 internal/ui/model/keys.go |  4 ++--
 internal/ui/model/ui.go   | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/internal/ui/model/keys.go b/internal/ui/model/keys.go
index 053c30aaa1b51b1fd04bc8a3e754460519336359..6e21e4dee0dbae1dffc124066b01185c7ebc9d3a 100644
--- a/internal/ui/model/keys.go
+++ b/internal/ui/model/keys.go
@@ -166,11 +166,11 @@ func DefaultKeyMap() KeyMap {
 	)
 
 	km.Chat.Down = key.NewBinding(
-		key.WithKeys("down", "ctrl+j", "ctrl+n", "j"),
+		key.WithKeys("down", "ctrl+j", "j"),
 		key.WithHelp("↓", "down"),
 	)
 	km.Chat.Up = key.NewBinding(
-		key.WithKeys("up", "ctrl+k", "ctrl+p", "k"),
+		key.WithKeys("up", "ctrl+k", "k"),
 		key.WithHelp("↑", "up"),
 	)
 	km.Chat.UpDown = key.NewBinding(
diff --git a/internal/ui/model/ui.go b/internal/ui/model/ui.go
index 94fdfe2a2d550ddbce4b12573b64eceedd33d93a..634b410ef74d5eb00e9d6e55dd1a87cc850c5d86 100644
--- a/internal/ui/model/ui.go
+++ b/internal/ui/model/ui.go
@@ -1511,6 +1511,16 @@ func (m *UI) handleKeyPressMsg(msg tea.KeyPressMsg) tea.Cmd {
 				m.focus = uiFocusEditor
 				cmds = append(cmds, m.textarea.Focus())
 				m.chat.Blur()
+			case key.Matches(msg, m.keyMap.Chat.NewSession):
+				if !m.hasSession() {
+					break
+				}
+				if m.isAgentBusy() {
+					cmds = append(cmds, uiutil.ReportWarn("Agent is busy, please wait before starting a new session..."))
+					break
+				}
+				m.focus = uiFocusEditor
+				m.newSession()
 			case key.Matches(msg, m.keyMap.Chat.Expand):
 				m.chat.ToggleExpandedSelectedItem()
 			case key.Matches(msg, m.keyMap.Chat.Up):