diff --git a/modules/completion/ivy/autoload/ivy.el b/modules/completion/ivy/autoload/ivy.el
index 924564e30..7710e00f7 100644
--- a/modules/completion/ivy/autoload/ivy.el
+++ b/modules/completion/ivy/autoload/ivy.el
@@ -217,3 +217,11 @@ counsel-rg)."
          (re-search-forward (ivy--regex ivy-text t) (line-end-position) t)
          (run-hooks 'counsel-grep-post-action-hook)
          (selected-window))))))
+
+;;;###autoload
+(defun +ivy-quit-and-resume ()
+  "Close the current popup window and resume ivy."
+  (interactive)
+  (when (doom-popup-p)
+    (doom/popup-close))
+  (ivy-resume))
diff --git a/modules/private/hlissner/+bindings.el b/modules/private/hlissner/+bindings.el
index 7d74773f4..4615ec3f2 100644
--- a/modules/private/hlissner/+bindings.el
+++ b/modules/private/hlissner/+bindings.el
@@ -301,6 +301,8 @@
 
  ;; help-mode
  (:map help-mode-map
+   :n "q"   #'quit-window
+   :n "Q"   #'+ivy-quit-and-resume
    :n "]]"  #'help-go-forward
    :n "[["  #'help-go-back
    :n "o"   #'ace-link-help)