diff --git a/plugin/gitgutter.vim b/plugin/gitgutter.vim
index bb7d50c..b2e9691 100644
--- a/plugin/gitgutter.vim
+++ b/plugin/gitgutter.vim
@@ -341,8 +341,18 @@ augroup gitgutter
   autocmd BufFilePre  * call s:on_buffilepre(expand('<abuf>'))
   autocmd BufFilePost * call s:on_buffilepost(expand('<abuf>'))
 
-  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
+  autocmd QuickFixCmdPre *vimgrep*
+        \ if gitgutter#utility#getbufvar(expand('<abuf>'), 'enabled') |
+        \   let s:gitgutter_was_enabled = expand('<abuf>') |
+        \ else |
+        \   let s:gitgutter_was_enabled = 0 |
+        \ endif |
+        \ GitGutterBufferDisable
+  autocmd QuickFixCmdPost *vimgrep*
+        \ if s:gitgutter_was_enabled |
+        \   call gitgutter#buffer_enable(s:gitgutter_was_enabled) |
+        \ endif |
+        \ unlet s:gitgutter_was_enabled
 augroup END
 
 " }}}