diff --git a/modules/ui/popup/autoload/popup.el b/modules/ui/popup/autoload/popup.el
index aeb35884e..ea6d6067f 100644
--- a/modules/ui/popup/autoload/popup.el
+++ b/modules/ui/popup/autoload/popup.el
@@ -181,7 +181,8 @@ and enables `+popup-buffer-mode'."
     (let ((window (or window (selected-window))))
       (and (windowp window)
            (window-live-p window)
-           (window-parameter window 'popup)
+           (or (window-parameter window 'popup)
+               (window-parameter window 'no-other-window))
            window))))
 
 ;;;###autoload