diff --git a/plugin/gitgutter.vim b/plugin/gitgutter.vim
index 008724e..5ddf0ed 100644
--- a/plugin/gitgutter.vim
+++ b/plugin/gitgutter.vim
@@ -296,8 +296,8 @@ augroup gitgutter
 
   autocmd User FugitiveChanged call gitgutter#all(1)
 
-  autocmd BufFilePre  * GitGutterBufferDisable
-  autocmd BufFilePost * GitGutterBufferEnable
+  autocmd BufFilePre  * let b:gitgutter_was_enabled = gitgutter#utility#getbufvar(expand('<abuf>'), 'enabled') | GitGutterBufferDisable
+  autocmd BufFilePost * if b:gitgutter_was_enabled | GitGutterBufferEnable | endif | unlet b:gitgutter_was_enabled
 
   " Handle all buffers when focus is gained, but only after it was lost.
   " FocusGained gets triggered on startup with Neovim at least already.
@@ -313,8 +313,8 @@ augroup gitgutter
   autocmd ColorScheme * call gitgutter#highlight#define_highlights()
 
   " Disable during :vimgrep
-  autocmd QuickFixCmdPre  *vimgrep* let [g:gitgutter_was_enabled, g:gitgutter_enabled] = [g:gitgutter_enabled, 0]
-  autocmd QuickFixCmdPost *vimgrep* let g:gitgutter_enabled = g:gitgutter_was_enabled | unlet g:gitgutter_was_enabled
+  autocmd QuickFixCmdPre  *vimgrep* let b:gitgutter_was_enabled = gitgutter#utility#getbufvar(expand('<abuf>'), 'enabled') | GitGutterBufferDisable
+  autocmd QuickFixCmdPost *vimgrep* if b:gitgutter_was_enabled | GitGutterBufferEnable | endif | unlet b:gitgutter_was_enabled
 augroup END
 
 " }}}