diff --git a/org-ql-completing-read.el b/org-ql-completing-read.el
index 18cfd7f..03f3db1 100644
--- a/org-ql-completing-read.el
+++ b/org-ql-completing-read.el
@@ -134,7 +134,7 @@ value, or nil."
 
 ;;;###autoload
 (cl-defun org-ql-completing-read
-    (buffers-files &key query-prefix query-filter
+    (buffers-files &key query-prefix query-filter narrowp
                    (action #'org-ql-completing-read-action)
                    ;; FIXME: Unused argument.
                    ;; (annotate #'org-ql-completing-read-snippet)
@@ -145,6 +145,8 @@ value, or nil."
   "Return marker at entry in BUFFERS-FILES selected with `org-ql'.
 PROMPT is shown to the user.
 
+NARROWP is passed to `org-ql-select', which see.
+
 QUERY-PREFIX may be a string to prepend to the query entered by
 the user (e.g. use \"heading:\" to only search headings, easily
 creating a custom command that saves the user from having to type
@@ -323,6 +325,7 @@ single predicate)."
                                                 bow (or ,@query-tokens) (0+ (not space))
                                                 (optional (repeat 1 3 (0+ space) (repeat 1 15 (not space))))))))
                     (org-ql-select buffers-files (org-ql--query-string-to-sexp input)
+                      :narrow narrowp
                       :action #'action))))
       (unless (listp buffers-files)
         ;; Since we map across this argument, we ensure it's a list.
diff --git a/org-ql-find.el b/org-ql-find.el
index 820d2dd..ed6d21d 100644
--- a/org-ql-find.el
+++ b/org-ql-find.el
@@ -54,14 +54,18 @@ See function `display-buffer'."
 ;;;; Commands
 
 ;;;###autoload
-(cl-defun org-ql-find (buffers-files &key query-prefix query-filter
+(cl-defun org-ql-find (buffers-files &key query-prefix query-filter widen
                                      (prompt "Find entry: "))
   "Go to an Org entry in BUFFERS-FILES selected by searching entries with `org-ql'.
 Interactively, search the buffers and files relevant to the
 current buffer (i.e. in `org-agenda-mode', the value of
 `org-ql-view-buffers-files' or `org-agenda-contributing-files';
-in `org-mode', that buffer).  With universal prefix, select
-multiple buffers to search with completion and PROMPT.
+in `org-mode', that buffer).
+
+With one or more universal prefix arguments, WIDEN buffers before
+searching (otherwise, respect any narrowing).  With two universal
+prefix arguments, select multiple buffers to search with
+completion and PROMPT.
 
 QUERY-PREFIX may be a string to prepend to the query (e.g. use
 \"heading:\" to only search headings, easily creating a custom
@@ -72,11 +76,17 @@ types is filtered before execution (e.g. it could replace spaces
 with commas to turn multiple tokens, which would normally be
 treated as multiple predicates, into multiple arguments to a
 single predicate)."
-  (interactive (list (org-ql-find--buffers)))
-  (let ((marker (org-ql-completing-read buffers-files
-                  :query-prefix query-prefix
-                  :query-filter query-filter
-                  :prompt prompt)))
+  (interactive (list (org-ql-find--buffers
+                      :read-buffer-p (equal '(16) current-prefix-arg))
+                     :widen current-prefix-arg))
+  (let ((marker (save-restriction
+                  (when (and widen (equal (current-buffer) buffers-files))
+                    (widen))
+                  (org-ql-completing-read buffers-files
+                    :narrowp (not widen)
+                    :query-prefix query-prefix
+                    :query-filter query-filter
+                    :prompt prompt))))
     (set-buffer (or (buffer-base-buffer (marker-buffer marker))
                     (marker-buffer marker)))
     (pop-to-buffer (current-buffer) org-ql-find-display-buffer-action)
@@ -195,15 +205,15 @@ multiple buffers to search with completion and PROMPT."
 
 ;;;; Functions
 
-(defun org-ql-find--buffers ()
-  "Return list of buffers to search in.
+(cl-defun org-ql-find--buffers (&key read-buffer-p)
+  "Return buffer or list of buffers to search in.
 In a mode derived from `org-agenda-mode', return the value of
 `org-ql-view-buffers-files' or `org-agenda-contributing-files'.
-In a mode derived from `org-mode', return the current buffer.
-When `current-prefix-arg', read a list of buffers in `org-mode'
-with completion.  To be used in `org-ql-find' commands'
-interactive forms."
-  (if current-prefix-arg
+In a mode derived from `org-mode', return the current buffer.  If
+READ-BUFFER-P, read a list of buffers in `org-mode' with
+completion.  To be used in `org-ql-find' commands' interactive
+forms."
+  (if read-buffer-p
       (mapcar #'get-buffer
               (completing-read-multiple
                "Buffers: "