diff --git a/vimrc b/vimrc
index 0341be7..9e82685 100644
--- a/vimrc
+++ b/vimrc
@@ -211,6 +211,13 @@ if &term =~ '256color'
   set t_ut=
 endif
 
+" Save and restore folds
+augroup remember_folds
+  autocmd!
+  autocmd BufWinLeave *.* silent! mkview
+  autocmd BufWinEnter *.* silent! loadview
+augroup END
+
 " Disable arrow keys
 map <up> <nop>
 map <down> <nop>