diff --git a/tmux/dot-tmux.conf b/tmux/dot-tmux.conf
index 4dc468c..3261df2 100644
--- a/tmux/dot-tmux.conf
+++ b/tmux/dot-tmux.conf
@@ -8,6 +8,12 @@ set -s escape-time 0
 set-window-option -g xterm-keys on
 set-option -g focus-events on
 
+# Setup vi-mode with better keybindings
+# TODO: Escape does not work properly for leaving
+setw -g mode-keys vi
+bind -T copy-mode-vi v send -X begin-selection
+bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel
+
 # Change leader
 unbind C-b
 set -g prefix C-a