diff --git a/modules/feature/popup/autoload.el b/modules/feature/popup/autoload.el
index 50834725c..a25587ddb 100644
--- a/modules/feature/popup/autoload.el
+++ b/modules/feature/popup/autoload.el
@@ -60,11 +60,10 @@ and enables `+popup-buffer-mode'."
   (let ((buffer (window-buffer window))
         ttl)
     (when (and (buffer-file-name buffer)
-               (buffer-modified-p buffer))
-      (with-current-buffer buffer
-        (if (y-or-n-p "Popup buffer is modified. Save it?")
-            (save-buffer)
-          (set-buffer-modified-p nil))))
+               (buffer-modified-p buffer)
+               (y-or-n-p "Popup buffer is modified. Save it?"))
+      (with-current-buffer buffer (save-buffer)))
+    (set-buffer-modified-p nil)
     (let ((ignore-window-parameters t))
       (delete-window window))
     (unless (window-live-p window)