diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index ff4ff46..241b989 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -38,9 +38,9 @@ set -g mouse on
 
 # Vi copypaste mode
 set-window-option -g mode-keys vi
-bind-key -t vi-copy 'v' begin-selection
-bind-key -t vi-copy 'y' copy-selection
-bind -t vi-copy y copy-pipe 'xclip -in -selection clipboard'
+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"
 
 # Smart pane switching with awareness of vim splits
 # See: https://github.com/christoomey/vim-tmux-navigator
@@ -55,6 +55,7 @@ bind -n C-l if-shell "$is_vim" "send-keys C-l" "select-pane -R"
 bind C-p run "tmux set-buffer \"$(xclip -o)\"; tmux paste-buffer"
 # move tmux copy buffer into x clipboard
 bind C-y run "tmux save-buffer - | xclip -i"
+set-option -s set-clipboard off
 
 source-file ~/.tmux/.tmux_config_powerline