diff --git a/core/autoload/popups.el b/core/autoload/popups.el
index dc1acfe8d..77a11cdbc 100644
--- a/core/autoload/popups.el
+++ b/core/autoload/popups.el
@@ -8,9 +8,11 @@
 current window if omitted."
   (when-let (target (or target (selected-window)))
     (cond ((bufferp target)
-           (buffer-local-value 'doom-popup-mode target))
+           (and (buffer-live-p target)
+                (buffer-local-value 'doom-popup-mode target)))
           ((windowp target)
-           (and (window-parameter target 'popup)
+           (and (window-live-p target)
+                (window-parameter target 'popup)
                 target)))))
 
 ;;;###autoload