diff --git a/tmux.conf b/tmux.conf
index d45b6ad..9ea443b 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -39,10 +39,11 @@ unbind %
 unbind '"'
 bind + split-window -h # horizontal split
 bind - split-window -v # vertical split
-bind -n C-h run "(tmux display-message -p '#{pane_title}' | grep -iq vim && tmux send-keys C-h) || tmux select-pane -L"
-bind -n C-j run "(tmux display-message -p '#{pane_title}' | grep -iq vim && tmux send-keys C-j) || tmux select-pane -D"
-bind -n C-k run "(tmux display-message -p '#{pane_title}' | grep -iq vim && tmux send-keys C-k) || tmux select-pane -U"
-bind -n C-l run "(tmux display-message -p '#{pane_title}' | grep -iq vim && tmux send-keys C-l) || tmux select-pane -R"
+bind -n C-h run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-h) || tmux select-pane -L"
+bind -n C-j run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-j) || tmux select-pane -D"
+bind -n C-k run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-k) || tmux select-pane -U"
+bind -n C-l run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-l) || tmux select-pane -R"
+bind -n C-\ run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys 'C-\\') || tmux select-pane -l"
 bind -r C-Down resize-pane -D 2
 bind -r C-Up resize-pane -U 2
 bind -r C-Left resize-pane -L 2
diff --git a/vimrc b/vimrc
index a4f5bbe..cb79856 100644
--- a/vimrc
+++ b/vimrc
@@ -208,4 +208,5 @@ Bundle 'vim-scripts/taglist.vim'
 let Tlist_Use_Right_Window=1
 let Tlist_GainFocus_On_ToggleOpen = 1
 Bundle 'saltstack/salt-vim'
+Bundle 'christoomey/vim-tmux-navigator'
 "" }}}