diff --git a/.tmux.conf b/.tmux.conf
index 7e39ad2..77d2d98 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -112,6 +112,9 @@ set -g status-interval 1
 set-option -g automatic-rename on
 set-option -g automatic-rename-format '#{b:pane_current_path}'
 
+# https://github.com/tmux/tmux/issues/2059
+set -ga terminal-overrides '*:Ss=\E[%p1%d q:Se=\E[ q' 
+
 # Plugin Customizations
 
 set -g @prefix_highlight_fg 'colour232' # default is 'colour231'
diff --git a/.vimrc b/.vimrc
index 1c62bb0..ffaf469 100644
--- a/.vimrc
+++ b/.vimrc
@@ -199,6 +199,9 @@ nmap <silent> <C-e> <Plug>(ale_next_wrap)
 
 " Disable tmux navigator when zooming the Vim pane
 let g:tmux_navigator_disable_when_zoomed = 1
+" https://github.com/tmux/tmux/issues/2059
+let &t_SI = "\e[5 q"
+let &t_EI = "\e[2 q"
 
 set backup		" keep a backup file (restore to previous version)
 set swapfile