diff --git a/nvim/init.vim b/nvim/init.vim
index 96b13f8..7957d2f 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -41,6 +41,8 @@ Plug 'zchee/deoplete-jedi'
 " Autocomplete for Rust
 Plug 'sebastianmarkow/deoplete-rust'
 Plug 'rust-lang/rust.vim'
+" Autoload and read from dish if file changes
+Plug 'tmux-plugins/vim-tmux-focus-events'
 
 " Initialize plugin system
 call plug#end()
@@ -102,6 +104,7 @@ set ignorecase          " Make searching case insensitive
 set smartcase           " ... unless the query has capital letters.
 set gdefault            " Use 'g' flag by default with :s/foo/bar/.
 set magic               " Use 'magic' patterns (extended regular expressions).
+set autoread            " Autoload file if it changes on disk
 
 set completeopt-=preview
 
diff --git a/tmux.conf b/tmux.conf
index b91b3a0..4d67711 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -33,6 +33,7 @@ set-option -g allow-rename off
 
 # mouse control (clickable windows, panes, resizable panes)
 set -g mouse on
+set -g focus-events on
 
 # Use Alt-arrow keys without prefix key to switch panes
 bind -n M-Left select-pane -L