diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index aa98381..00bbbf5 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -37,9 +37,6 @@ bind r source-file ~/.tmux.conf\; display "Conf reloaded!"
 
 set -g mouse on
 
-# Vi copypaste mode
-set-window-option -g mode-keys vi
-set -g @yank_action 'copy-pipe'
 #bind-key -Tcopy-mode-vi 'v' send -X begin-selection
 #bind-key -Tcopy-mode-vi 'y' send -X copy-selection
 #bind -Tcopy-mode-vi y send -X copy-pipe "xclip -i -sel p -f | xclip -i -sel c" \; display-message "copied to system clipboard"
@@ -60,7 +57,11 @@ bind-key C-o send-keys C-o
 # move x clipboard into tmux paste buffer
 #bind C-p run "tmux set-buffer \"$(xclip -o)\"; tmux paste-buffer"
 # move tmux copy buffer into x clipboard
+# Vi copypaste mode
+set-window-option -g mode-keys vi
 set-option -s set-clipboard on
+set -g @yank_with_mouse off
+set -g @yank_action 'copy-pipe'
 
 if '[ `uname` == Darwin ]' \
     'source-file ~/.tmux/.mac_config'