diff --git a/tmux.conf b/tmux.conf
index 774ecda..7fbc5b6 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -35,6 +35,11 @@ setw -g automatic-rename    on                  # automatically rename windows
 setw -g mouse               on                  # enable mouse support
 setw -g pane-base-index     1                   # start pane numbering from 1
 
+# Fix for clipboard in vim running inside tmux:
+#   See http://stackoverflow.com/a/40154047
+#   See https://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard
+set -g default-command "reattach-to-user-namespace -l $SHELL"
+
 #
 # Status bar
 #