diff --git a/plugin/mappings.vim b/plugin/mappings.vim
index 05e8726..a873b76 100644
--- a/plugin/mappings.vim
+++ b/plugin/mappings.vim
@@ -80,10 +80,10 @@ if has('nvim')
   tnoremap <silent> <C-w>k <C-\><C-n>:TmuxNavigateUp<CR>
   tnoremap <silent> <C-w>l <C-\><C-n>:TmuxNavigateRight<CR>
 else
-  tnoremap <silent> h :TmuxNavigateLeft<CR>
-  tnoremap <silent> j :TmuxNavigateDown<CR>
-  tnoremap <silent> k :TmuxNavigateUp<CR>
-  tnoremap <silent> l :TmuxNavigateRight<CR>
+  tnoremap <silent> <C-w>h <C-w>N:TmuxNavigateLeft<CR>
+  tnoremap <silent> <C-w>j <C-w>N:TmuxNavigateDown<CR>
+  tnoremap <silent> <C-w>k <C-w>N:TmuxNavigateUp<CR>
+  tnoremap <silent> <C-w>l <C-w>N:TmuxNavigateRight<CR>
 endif
 
 " Quick tabs