diff --git a/lisp/lib/docs.el b/lisp/lib/docs.el
index ff7218684..1f7d90d28 100644
--- a/lisp/lib/docs.el
+++ b/lisp/lib/docs.el
@@ -485,6 +485,13 @@ This primes `org-mode' for reading."
          ("" 'warning))))
   "Extra font-lock keywords for Doom documentation.")
 
+(defvar doom-docs-org-mode-map
+  (let ((map (make-sparse-keymap))
+        (cmd (cmds! buffer-read-only #'kill-current-buffer)))
+    (define-key map "q" cmd)
+    (define-key map [remap evil-record-macro] cmd)
+    map))
+
 ;;;###autoload
 (define-derived-mode doom-docs-org-mode org-mode "Doom Docs"
   "A derivative of `org-mode' for Doom's documentation files.