diff --git a/core/defuns/defuns-popups.el b/core/defuns/defuns-popups.el
index 8c45ee058..67fd1d71b 100644
--- a/core/defuns/defuns-popups.el
+++ b/core/defuns/defuns-popups.el
@@ -49,7 +49,8 @@ window. Returns nil or the popup window."
   `(let ((popup-p (doom/popups-p))
          (in-popup-p (doom/popup-p)))
      (when popup-p
-       (doom/popup-close-all t))
+       (doom/popup-close-all t)
+       (doom/popup-close nil t))
      (prog1
          ,@body
        (when popup-p