   (find-file (expand-file-name "index.org" doom-docs-dir)))
 
 ;;;###autoload
-(defun doom/help-search ()
+(defun doom/help-search (&optional initial-input)
   "Search Doom's documentation and jump to a headline."
   (interactive)
   (let (ivy-sort-functions-alist)
-    (completing-read
-     "Find in Doom help: "
-     (doom-completing-read-org-headlings (list "getting_started.org"
-                                               "contributing.org"
-                                               "troubleshooting.org"
-                                               "tutorials.org"
-                                               "faq.org")
-                                         2 t))))
-
-;;;###autoload
-(defun doom/help-faq ()
+    (doom-completing-read-org-headings
+      "Find in Doom help: "
+      (list "getting_started.org"
+            "contributing.org"
+            "troubleshooting.org"
+            "tutorials.org"
+            "faq.org"
+            "../modules/README.org")
+      2 t initial-input)))
+
+;;;###autoload
+(defun doom/help-faq (&optional initial-input)
   "Search Doom's FAQ and jump to a question."
   (interactive)
-  (completing-read "Find in FAQ: "
-                   (doom-completing-read-org-headlings (list "faq.org"))))
+  (doom-completing-read-org-headings
+   "Find in FAQ: " (list "faq.org")
+   nil nil initial-input))
 
 ;;;###autoload
 (defun doom/help-news ()

;;
;;; Documentation commands

;;;###autoload
(defun doom-completing-read-org-headlings (files &optional depth include-files)
  (require 'org)
  (let* ((default-directory doom-docs-dir)
         (org-agenda-files (mapcar #'expand-file-name (doom-enlist files)))

                                    (<= level depth))
                                (or (null tags)
                                    (not (string-match-p ":TOC" tags))))
                       (propertize
                        (mapconcat
                         'identity
                         (list (mapconcat #'identity
