diff --git a/tmux/dot-tmux.conf b/tmux/dot-tmux.conf
index 82de911..f4265e9 100644
--- a/tmux/dot-tmux.conf
+++ b/tmux/dot-tmux.conf
@@ -20,10 +20,10 @@ set -g prefix C-a
 
 # Improve navigation between tmux and nvim
 # TODO: Disable pane selection wrap
-bind-key -n M-h if -F "#{@pane-is-vim}" 'send-keys M-h'  'select-pane -L'
-bind-key -n M-j if -F "#{@pane-is-vim}" 'send-keys M-j'  'select-pane -D'
-bind-key -n M-k if -F "#{@pane-is-vim}" 'send-keys M-k'  'select-pane -U'
-bind-key -n M-l if -F "#{@pane-is-vim}" 'send-keys M-l'  'select-pane -R'
+bind-key -n M-h if -F "#{@pane-is-vim}" 'send-keys M-h'  "run '#{select_pane_no_wrap} L'"
+bind-key -n M-j if -F "#{@pane-is-vim}" 'send-keys M-j'  "run '#{select_pane_no_wrap} D'"
+bind-key -n M-k if -F "#{@pane-is-vim}" 'send-keys M-k'  "run '#{select_pane_no_wrap} U'"
+bind-key -n M-l if -F "#{@pane-is-vim}" 'send-keys M-l'  "run '#{select_pane_no_wrap} R'"
 
 bind-key -T copy-mode-vi 'M-h' select-pane -L
 bind-key -T copy-mode-vi 'M-j' select-pane -D
@@ -58,4 +58,6 @@ wg_is_keys_off="#([ $(tmux show-option -qv key-table) = 'off' ] && echo 'TRUE' )
 # Load theme
 source-file "$DOTFILES/tmux/gruvbox.conf"
 
+set -g @plugin "dalejung/tmux-select-pane-no-wrap"
+
 run "$DOTFILES/tmux/tpm/tpm"