diff --git a/.tmux.conf b/.tmux.conf
index e4f286b5..e86c96b8 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -77,6 +77,8 @@ bind C-c new-window -c '#{pane_current_path}';
 bind v split-window -h -c '#{pane_current_path}';
 bind s split-window -v -c '#{pane_current_path}';
 
+# Smart pane switching with awareness of Vim splits.
+# See: https://github.com/christoomey/vim-tmux-navigator
 is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
     | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|l?n?vim?x?|fzf)(diff)?$'"
 bind-key -n 'C-h' if-shell "$is_vim" 'send-keys C-h'  'select-pane -L'
@@ -85,6 +87,12 @@ bind-key -n 'C-k' if-shell "$is_vim" 'send-keys C-k'  'select-pane -U'
 bind-key -n 'C-l' if-shell "$is_vim" 'send-keys C-l'  'select-pane -R'
 bind-key -n 'C-\' if-shell "$is_vim" 'send-keys C-\\'  'select-pane -l'
 
+bind-key -T copy-mode-vi 'C-h' select-pane -L
+bind-key -T copy-mode-vi 'C-j' select-pane -D
+bind-key -T copy-mode-vi 'C-k' select-pane -U
+bind-key -T copy-mode-vi 'C-l' select-pane -R
+bind-key -T copy-mode-vi 'C-\' select-pane -l
+
 # fzf-git
 bind-key -T root    C-g switch-client -T fzf-git
 bind-key -T fzf-git C-f send-keys C-g f