diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 2f44792..418a31a 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -42,7 +42,32 @@ fun! ShowNumberIfNecessary()
     setlocal nu
 endfun
 autocmd BufEnter * call ShowNumberIfNecessary()
-autocmd TermOpen term://* setlocal nonumber
+autocmd TermOpen,TermEnter term://* setlocal nonumber
+
+" Terminal remapping
+lua << EOF
+function _G.set_terminal_keymaps()
+    local opts = {buffer = 0}
+    vim.keymap.set('t', '<esc>', [[<C-\><C-n>]], opts)
+    vim.keymap.set('t', 'jk', [[<C-\><C-n>]], opts)
+    vim.keymap.set('t', '<C-h>', [[<Cmd>wincmd h<CR>]], opts)
+    vim.keymap.set('t', '<C-j>', [[<Cmd>wincmd j<CR>]], opts)
+    vim.keymap.set('t', '<C-k>', [[<Cmd>wincmd k<CR>]], opts)
+    vim.keymap.set('t', '<C-l>', [[<Cmd>wincmd l<CR>]], opts)
+end
+EOF
+autocmd TermOpen term://* lua set_terminal_keymaps()
+
+" Focus moving remaps
+lua << EOF
+function _G.set_focus_keymaps()
+    vim.keymap.set('n', '<C-h>', [[<Cmd>wincmd h<CR>]], opts)
+    vim.keymap.set('n', '<C-j>', [[<Cmd>wincmd j<CR>]], opts)
+    vim.keymap.set('n', '<C-k>', [[<Cmd>wincmd k<CR>]], opts)
+    vim.keymap.set('n', '<C-l>', [[<Cmd>wincmd l<CR>]], opts)
+end
+EOF
+autocmd BufEnter * lua set_focus_keymaps()
 
 " Startup commands
 autocmd UIEnter * Neotree