@@ -1424,14 +1424,14 @@ func (m *UI) handleKeyPressMsg(msg tea.KeyPressMsg) tea.Cmd {
14241424 return true
14251425 }
14261426 case key.Matches(msg, m.keyMap.Chat.PillLeft):
1427− if m.state == uiChat && m.hasSession() && m.pillsExpanded {
1427+ if m.state == uiChat && m.hasSession() && m.pillsExpanded && m.focus != uiFocusEditor {
14281428 if cmd := m.switchPillSection(-1); cmd != nil {
14291429 cmds = append(cmds, cmd)
14301430 }
14311431 return true
14321432 }
14331433 case key.Matches(msg, m.keyMap.Chat.PillRight):
1434− if m.state == uiChat && m.hasSession() && m.pillsExpanded {
1434+ if m.state == uiChat && m.hasSession() && m.pillsExpanded && m.focus != uiFocusEditor {
14351435 if cmd := m.switchPillSection(1); cmd != nil {
14361436 cmds = append(cmds, cmd)
14371437 }