diff --git a/modules/feature/popup/autoload.el b/modules/feature/popup/autoload.el
index dd8385289..f7a358f8f 100644
--- a/modules/feature/popup/autoload.el
+++ b/modules/feature/popup/autoload.el
@@ -302,9 +302,10 @@ This window parameter is ignored if FORCE-P is non-nil."
   "If popups are open, close them. If they aren't, restore the last one or open
 the message buffer in a popup window."
   (interactive)
-  (condition-case _
-      (window-toggle-side-windows)
-    ('error (display-buffer (get-buffer "*Messages*")))))
+  (cond ((+popup-windows)
+         (+popup/close-all t))
+        ((ignore-errors (+popup/restore)))
+        ((display-buffer (get-buffer "*Messages*")))))
 
 ;;;###autoload
 (defun +popup/restore ()