diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index fbd1664..2be87b6 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -79,6 +79,9 @@ set -g history-limit 10000
 # New windows/pane in $PWD
 bind c new-window -F "#{pane_current_path}"
 
+# Fix key bindings broken in tmux 2.1
+set -g assume-paste-time 0
+
 # force a reload of the config file
 unbind r
 bind r source-file ~/.tmux.conf \; display "Reloaded!"