diff --git a/vim/.vim/after/ftplugin/netrw.vim b/vim/.vim/after/ftplugin/netrw.vim
new file mode 100644
index 0000000..f676d21
--- /dev/null
+++ b/vim/.vim/after/ftplugin/netrw.vim
@@ -0,0 +1,3 @@
+" Don't show Netrw in buffer list
+setlocal bufhidden=delete
+let b:undo_ftplugin='|setlocal bufhidden<'
diff --git a/vim/.vimrc b/vim/.vimrc
index 4f337a5..421b3d5 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -144,8 +144,6 @@ call plug#end()
 set nobackup
 " Disable swapfiles too
 set noswapfile
-" Don't show Netrw buffers
-autocmd FileType netrw setlocal bufhidden=delete
 " }}}
 
 " UI and UX parameters {{{