diff --git a/core/core-editor.el b/core/core-editor.el
index 936e500fc..3f63ef86a 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -231,9 +231,7 @@ sake."
 (def-package! wgrep
   :commands (wgrep-setup wgrep-change-to-wgrep-mode)
   :config
-  (setq wgrep-auto-save-buffer t)
-  (advice-add #'wgrep-abort-changes :after #'doom/popup-close)
-  (advice-add #'wgrep-finish-edit :after #'doom/popup-close))
+  (setq wgrep-auto-save-buffer t))
 
 (provide 'core-editor)
 ;;; core-editor.el ends here
diff --git a/core/core-popups.el b/core/core-popups.el
index bbedb5186..1e40251e0 100644
--- a/core/core-popups.el
+++ b/core/core-popups.el
@@ -468,6 +468,12 @@ that `doom*popup-save' won't break it."
   (setq twittering-pop-to-buffer-function #'pop-to-buffer))
 
 
+(after! wgrep
+  ;; close the popup after you're done with a wgrep buffer
+  (advice-add #'wgrep-abort-changes :after #'doom/popup-close)
+  (advice-add #'wgrep-finish-edit   :after #'doom/popup-close))
+
+
 (after! xref
   (defun doom*xref-follow-and-close (orig-fn &rest args)
     "Jump to the xref on the current line, select its window and close the popup