diff --git a/init.lua b/init.lua
index df578c6..fce3626 100644
--- a/init.lua
+++ b/init.lua
@@ -613,10 +613,11 @@ do
   vim.keymap.set("n", "Q", "<nop>")
 
   -- Window movement
-  vim.keymap.set("n", "<c-h>", "<c-w>h")
-  vim.keymap.set("n", "<c-j>", "<c-w>j")
-  vim.keymap.set("n", "<c-k>", "<c-w>k")
-  vim.keymap.set("n", "<c-l>", "<c-w>l")
+  vim.g.tmux_navigator_no_mappings = 1
+  vim.keymap.set("n", "<c-h>", ":TmuxNavigateLeft<CR>", { noremap = true, silent=true })
+  vim.keymap.set("n", "<c-j>", ":TmuxNavigateDown<CR>", { noremap = true, silent=true })
+  vim.keymap.set("n", "<c-k>", ":TmuxNavigateUp<CR>", { noremap = true, silent=true })
+  vim.keymap.set("n", "<c-l>", ":TmuxNavigateRight<CR>", { noremap = true, silent=true })
 
   -- Resize windows
   vim.keymap.set('n', '<M-j>', ':resize -2<cr>', { silent = true })