1 files changed, 9 insertions, 1 deletions

diff --git a/neovim/.config/nvim/lua/config/keymaps.lua b/neovim/.config/nvim/lua/config/keymaps.lua
index f0bfbec..66e97a0 100644
--- a/neovim/.config/nvim/lua/config/keymaps.lua
+++ b/neovim/.config/nvim/lua/config/keymaps.lua
@@ -1,10 +1,18 @@
 local map = vim.keymap.set
 
--- Switch windows with <C-[direction]>
+-- Switch windows with <C-[direction]>, from Normal mode or from inside a
+-- terminal buffer (e.g. claude-code.nvim's split) without leaving it first.
+-- Terminal mode passes keys straight to the running process by default, so
+-- <C-w><direction> alone never reaches Neovim there - <C-\><C-n> escapes to
+-- Normal mode before running the window command.
 map("n", "<C-j>", "<C-w>j")
 map("n", "<C-k>", "<C-w>k")
 map("n", "<C-h>", "<C-w>h")
 map("n", "<C-l>", "<C-w>l")
+map("t", "<C-j>", [[<C-\><C-n><C-w>j]])
+map("t", "<C-k>", [[<C-\><C-n><C-w>k]])
+map("t", "<C-h>", [[<C-\><C-n><C-w>h]])
+map("t", "<C-l>", [[<C-\><C-n><C-w>l]])
 
 -- Never use the arrow keys
 for _, key in ipairs({ "<Up>", "<Down>", "<Left>", "<Right>" }) do