diff --git a/core/autoload/popups.el b/core/autoload/popups.el
index 64b647477..63977af8b 100644
--- a/core/autoload/popups.el
+++ b/core/autoload/popups.el
@@ -95,7 +95,9 @@ possible rules."
   "Close the current popup *if* its window doesn't have a noesc parameter."
   (interactive)
   (if (window-parameter (selected-window) 'noesc)
-      (call-interactively 'evil-force-normal-state)
+      (call-interactively (if (featurep 'evil)
+                              'evil-force-normal-state
+                            'keyboard-escape-quit))
     (doom/popup-close)))
 
 (defun doom--popup-data (window)