diff --git a/plugin/gitgutter.vim b/plugin/gitgutter.vim
index 915c83f..152e8d8 100644
--- a/plugin/gitgutter.vim
+++ b/plugin/gitgutter.vim
@@ -296,8 +296,8 @@ augroup gitgutter
   autocmd ColorScheme * call gitgutter#highlight#define_highlights()
 
   " Disable during :vimgrep
-  autocmd QuickFixCmdPre  *vimgrep* let g:gitgutter_enabled = 0
-  autocmd QuickFixCmdPost *vimgrep* let g:gitgutter_enabled = 1
+  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
 augroup END
 
 " }}}