diff --git a/README.org b/README.org
index 2e815fd..515bfb9 100644
--- a/README.org
+++ b/README.org
@@ -557,6 +557,12 @@ Simple links may also be written manually in either sexp or non-sexp form, like:
 
 Nothing new yet.
 
+** 0.8.4
+
+*Fixes*
+
++ Command ~org-ql-find~ goes to the selected entry in the base buffer (rather than potentially an indirect buffer, whose narrowing could leave the selected entry hidden.  The nuances around going to entries in buffers that may be indirect and/or narrowed are surprisingly complicated.  Hopefully this is the last fix).
+
 ** 0.8.3
 
 *Fixes*
diff --git a/org-ql-find.el b/org-ql-find.el
index 591e958..f6f2b9c 100644
--- a/org-ql-find.el
+++ b/org-ql-find.el
@@ -75,7 +75,8 @@ single predicate)."
                   :query-prefix query-prefix
                   :query-filter query-filter
                   :prompt prompt)))
-    (set-buffer (marker-buffer marker))
+    (set-buffer (or (buffer-base-buffer (marker-buffer marker))
+                    (marker-buffer marker)))
     (pop-to-buffer (current-buffer) org-ql-find-display-buffer-action)
     (without-restriction
       (goto-char marker)
diff --git a/org-ql.info b/org-ql.info
index 302c2c8..8e58136 100644
--- a/org-ql.info
+++ b/org-ql.info
@@ -73,6 +73,7 @@ Functions / Macros
 Changelog
 
 * 0.9-pre: 09-pre.
+* 0.8.4: 084.
 * 0.8.3: 083.
 * 0.8.2: 082.
 * 0.8.1: 081.
@@ -1033,6 +1034,7 @@ releases.
 * Menu:
 
 * 0.9-pre: 09-pre.
+* 0.8.4: 084.
 * 0.8.3: 083.
 * 0.8.2: 082.
 * 0.8.1: 081.
@@ -1069,7 +1071,7 @@ releases.
 * 0.1: 01.
 
 
-File: README.info,  Node: 09-pre,  Next: 083,  Up: Changelog
+File: README.info,  Node: 09-pre,  Next: 084,  Up: Changelog
 
 5.1 0.9-pre
 ===========
@@ -1077,9 +1079,23 @@ File: README.info,  Node: 09-pre,  Next: 083,  Up: Changelog
 Nothing new yet.
 
 
-File: README.info,  Node: 083,  Next: 082,  Prev: 09-pre,  Up: Changelog
+File: README.info,  Node: 084,  Next: 083,  Prev: 09-pre,  Up: Changelog
 
-5.2 0.8.3
+5.2 0.8.4
+=========
+
+*Fixes*
+
+   • Command ‘org-ql-find’ goes to the selected entry in the base buffer
+     (rather than potentially an indirect buffer, whose narrowing could
+     leave the selected entry hidden.  The nuances around going to
+     entries in buffers that may be indirect and/or narrowed are
+     surprisingly complicated.  Hopefully this is the last fix).
+
+
+File: README.info,  Node: 083,  Next: 082,  Prev: 084,  Up: Changelog
+
+5.3 0.8.3
 =========
 
 *Fixes*
@@ -1092,7 +1108,7 @@ File: README.info,  Node: 083,  Next: 082,  Prev: 09-pre,  Up: Changelog
 
 File: README.info,  Node: 082,  Next: 081,  Prev: 083,  Up: Changelog
 
-5.3 0.8.2
+5.4 0.8.2
 =========
 
 *Fixes*
@@ -1106,7 +1122,7 @@ File: README.info,  Node: 082,  Next: 081,  Prev: 083,  Up: Changelog
 
 File: README.info,  Node: 081,  Next: 08,  Prev: 082,  Up: Changelog
 
-5.4 0.8.1
+5.5 0.8.1
 =========
 
 *Fixes*
@@ -1121,7 +1137,7 @@ File: README.info,  Node: 081,  Next: 08,  Prev: 082,  Up: Changelog
 
 File: README.info,  Node: 08,  Next: 074,  Prev: 081,  Up: Changelog
 
-5.5 0.8
+5.6 0.8
 =======
 
 *Additions*
@@ -1177,7 +1193,7 @@ File: README.info,  Node: 08,  Next: 074,  Prev: 081,  Up: Changelog
 
 File: README.info,  Node: 074,  Next: 073,  Prev: 08,  Up: Changelog
 
-5.6 0.7.4
+5.7 0.7.4
 =========
 
 *Fixes*
@@ -1187,7 +1203,7 @@ File: README.info,  Node: 074,  Next: 073,  Prev: 08,  Up: Changelog
 
 File: README.info,  Node: 073,  Next: 072,  Prev: 074,  Up: Changelog
 
-5.7 0.7.3
+5.8 0.7.3
 =========
 
 *Fixes*
@@ -1205,7 +1221,7 @@ File: README.info,  Node: 073,  Next: 072,  Prev: 074,  Up: Changelog
 
 File: README.info,  Node: 072,  Next: 071,  Prev: 073,  Up: Changelog
 
-5.8 0.7.2
+5.9 0.7.2
 =========
 
 *Fixes*
@@ -1226,8 +1242,8 @@ File: README.info,  Node: 072,  Next: 071,  Prev: 073,  Up: Changelog
 
 File: README.info,  Node: 071,  Next: 07,  Prev: 072,  Up: Changelog
 
-5.9 0.7.1
-=========
+5.10 0.7.1
+==========
 
 *Fixes*
    • Function ‘org-ql-completing-read’ is more compatible with default
@@ -1245,7 +1261,7 @@ File: README.info,  Node: 071,  Next: 07,  Prev: 072,  Up: Changelog
 
 File: README.info,  Node: 07,  Next: 063,  Prev: 071,  Up: Changelog
 
-5.10 0.7
+5.11 0.7
 ========
 
 *Added*
@@ -1304,7 +1320,7 @@ File: README.info,  Node: 07,  Next: 063,  Prev: 071,  Up: Changelog
 
 File: README.info,  Node: 063,  Next: 062,  Prev: 07,  Up: Changelog
 
-5.11 0.6.3
+5.12 0.6.3
 ==========
 
 *Fixed*
@@ -1320,7 +1336,7 @@ File: README.info,  Node: 063,  Next: 062,  Prev: 07,  Up: Changelog
 
 File: README.info,  Node: 062,  Next: 061,  Prev: 063,  Up: Changelog
 
-5.12 0.6.2
+5.13 0.6.2
 ==========
 
 *Fixed*
@@ -1331,7 +1347,7 @@ File: README.info,  Node: 062,  Next: 061,  Prev: 063,  Up: Changelog
 
 File: README.info,  Node: 061,  Next: 06,  Prev: 062,  Up: Changelog
 
-5.13 0.6.1
+5.14 0.6.1
 ==========
 
 *Fixed*
@@ -1349,7 +1365,7 @@ File: README.info,  Node: 061,  Next: 06,  Prev: 062,  Up: Changelog
 
 File: README.info,  Node: 06,  Next: 052,  Prev: 061,  Up: Changelog
 
-5.14 0.6
+5.15 0.6
 ========
 
 *Added*
@@ -1416,7 +1432,7 @@ File: README.info,  Node: 06,  Next: 052,  Prev: 061,  Up: Changelog
 
 File: README.info,  Node: 052,  Next: 051,  Prev: 06,  Up: Changelog
 
-5.15 0.5.2
+5.16 0.5.2
 ==========
 
 *Fixed*
@@ -1427,7 +1443,7 @@ File: README.info,  Node: 052,  Next: 051,  Prev: 06,  Up: Changelog
 
 File: README.info,  Node: 051,  Next: 05,  Prev: 052,  Up: Changelog
 
-5.16 0.5.1
+5.17 0.5.1
 ==========
 
 *Fixed*
@@ -1440,7 +1456,7 @@ File: README.info,  Node: 051,  Next: 05,  Prev: 052,  Up: Changelog
 
 File: README.info,  Node: 05,  Next: 049,  Prev: 051,  Up: Changelog
 
-5.17 0.5
+5.18 0.5
 ========
 
 *Added*
@@ -1481,7 +1497,7 @@ File: README.info,  Node: 05,  Next: 049,  Prev: 051,  Up: Changelog
 
 File: README.info,  Node: 049,  Next: 048,  Prev: 05,  Up: Changelog
 
-5.18 0.4.9
+5.19 0.4.9
 ==========
 
 *Fixed*
@@ -1492,7 +1508,7 @@ File: README.info,  Node: 049,  Next: 048,  Prev: 05,  Up: Changelog
 
 File: README.info,  Node: 048,  Next: 047,  Prev: 049,  Up: Changelog
 
-5.19 0.4.8
+5.20 0.4.8
 ==========
 
 *Fixed*
@@ -1504,7 +1520,7 @@ File: README.info,  Node: 048,  Next: 047,  Prev: 049,  Up: Changelog
 
 File: README.info,  Node: 047,  Next: 046,  Prev: 048,  Up: Changelog
 
-5.20 0.4.7
+5.21 0.4.7
 ==========
 
 *Fixed*
@@ -1517,7 +1533,7 @@ File: README.info,  Node: 047,  Next: 046,  Prev: 048,  Up: Changelog
 
 File: README.info,  Node: 046,  Next: 045,  Prev: 047,  Up: Changelog
 
-5.21 0.4.6
+5.22 0.4.6
 ==========
 
 *Fixed*
@@ -1530,7 +1546,7 @@ File: README.info,  Node: 046,  Next: 045,  Prev: 047,  Up: Changelog
 
 File: README.info,  Node: 045,  Next: 044,  Prev: 046,  Up: Changelog
 
-5.22 0.4.5
+5.23 0.4.5
 ==========
 
 *Fixed*
@@ -1542,7 +1558,7 @@ File: README.info,  Node: 045,  Next: 044,  Prev: 046,  Up: Changelog
 
 File: README.info,  Node: 044,  Next: 043,  Prev: 045,  Up: Changelog
 
-5.23 0.4.4
+5.24 0.4.4
 ==========
 
 *Fixed*
@@ -1554,7 +1570,7 @@ File: README.info,  Node: 044,  Next: 043,  Prev: 045,  Up: Changelog
 
 File: README.info,  Node: 043,  Next: 042,  Prev: 044,  Up: Changelog
 
-5.24 0.4.3
+5.25 0.4.3
 ==========
 
 *Fixed*
@@ -1564,7 +1580,7 @@ File: README.info,  Node: 043,  Next: 042,  Prev: 044,  Up: Changelog
 
 File: README.info,  Node: 042,  Next: 041,  Prev: 043,  Up: Changelog
 
-5.25 0.4.2
+5.26 0.4.2
 ==========
 
 *Fixed*
@@ -1573,7 +1589,7 @@ File: README.info,  Node: 042,  Next: 041,  Prev: 043,  Up: Changelog
 
 File: README.info,  Node: 041,  Next: 04,  Prev: 042,  Up: Changelog
 
-5.26 0.4.1
+5.27 0.4.1
 ==========
 
 *Fixed*
@@ -1583,7 +1599,7 @@ File: README.info,  Node: 041,  Next: 04,  Prev: 042,  Up: Changelog
 
 File: README.info,  Node: 04,  Next: 032,  Prev: 041,  Up: Changelog
 
-5.27 0.4
+5.28 0.4
 ========
 
 _Note:_ The next release, 0.5, may include changes which will require
@@ -1664,7 +1680,7 @@ automatically, as they will be pushed to the ‘master’ branch when ready.
 
 File: README.info,  Node: 032,  Next: 031,  Prev: 04,  Up: Changelog
 
-5.28 0.3.2
+5.29 0.3.2
 ==========
 
 *Fixed*
@@ -1677,7 +1693,7 @@ File: README.info,  Node: 032,  Next: 031,  Prev: 04,  Up: Changelog
 
 File: README.info,  Node: 031,  Next: 03,  Prev: 032,  Up: Changelog
 
-5.29 0.3.1
+5.30 0.3.1
 ==========
 
 *Fixed*
@@ -1687,7 +1703,7 @@ File: README.info,  Node: 031,  Next: 03,  Prev: 032,  Up: Changelog
 
 File: README.info,  Node: 03,  Next: 023,  Prev: 031,  Up: Changelog
 
-5.30 0.3
+5.31 0.3
 ========
 
 *Added*
@@ -1755,7 +1771,7 @@ File: README.info,  Node: 03,  Next: 023,  Prev: 031,  Up: Changelog
 
 File: README.info,  Node: 023,  Next: 022,  Prev: 03,  Up: Changelog
 
-5.31 0.2.3
+5.32 0.2.3
 ==========
 
 *Fixed*
@@ -1765,7 +1781,7 @@ File: README.info,  Node: 023,  Next: 022,  Prev: 03,  Up: Changelog
 
 File: README.info,  Node: 022,  Next: 021,  Prev: 023,  Up: Changelog
 
-5.32 0.2.2
+5.33 0.2.2
 ==========
 
 *Fixed*
@@ -1776,7 +1792,7 @@ File: README.info,  Node: 022,  Next: 021,  Prev: 023,  Up: Changelog
 
 File: README.info,  Node: 021,  Next: 02,  Prev: 022,  Up: Changelog
 
-5.33 0.2.1
+5.34 0.2.1
 ==========
 
 *Fixed*
@@ -1786,7 +1802,7 @@ File: README.info,  Node: 021,  Next: 02,  Prev: 022,  Up: Changelog
 
 File: README.info,  Node: 02,  Next: 01,  Prev: 021,  Up: Changelog
 
-5.34 0.2
+5.35 0.2
 ========
 
 *Added*
@@ -1869,7 +1885,7 @@ File: README.info,  Node: 02,  Next: 01,  Prev: 021,  Up: Changelog
 
 File: README.info,  Node: 01,  Prev: 02,  Up: Changelog
 
-5.35 0.1
+5.36 0.1
 ========
 
 First tagged release.
@@ -1927,80 +1943,81 @@ GPLv3
 
 Tag Table:
 Node: Top225
-Node: Contents1912
-Node: Screenshots2035
-Node: Installation2153
-Node: Quelpa2667
-Node: Helm support3195
-Node: Usage3598
-Node: Commands3996
-Node: org-ql-find4461
-Node: org-ql-open-link5369
-Node: org-ql-refile6224
-Node: org-ql-search6552
-Node: helm-org-ql8483
-Node: org-ql-view8861
-Node: org-ql-view-sidebar9391
-Node: org-ql-view-recent-items9771
-Node: org-ql-sparse-tree10267
-Node: Queries11067
-Node: Non-sexp query syntax12184
-Node: General predicates13943
-Node: Ancestor/descendant predicates20868
-Node: Date/time predicates21996
-Node: Functions / Macros25120
-Node: Agenda-like views25418
-Ref: Function org-ql-block25580
-Node: Listing / acting-on results26841
-Ref: Caching27049
-Ref: Function org-ql-select27962
-Ref: Function org-ql-query30388
-Ref: Macro org-ql (deprecated)32162
-Node: Custom predicates32477
-Ref: Macro org-ql-defpred32701
-Node: Dynamic block36142
-Node: Links38866
-Node: Tips39553
-Node: Changelog39877
-Node: 09-pre40754
-Node: 08340861
-Node: 08241205
-Node: 08141598
-Node: 0842019
-Node: 07444743
-Node: 07344966
-Node: 07245698
-Node: 07146617
-Node: 0747426
-Node: 06350292
-Node: 06250825
-Node: 06151132
-Node: 0651702
-Node: 05254758
-Node: 05155060
-Node: 0555485
-Node: 04957016
-Node: 04857298
-Node: 04757647
-Node: 04658056
-Node: 04558464
-Node: 04458825
-Node: 04359184
-Node: 04259387
-Node: 04159548
-Node: 0459795
-Node: 03263896
-Node: 03164299
-Node: 0364496
-Node: 02367796
-Node: 02268030
-Node: 02168310
-Node: 0268515
-Node: 0172593
-Node: Notes72694
-Node: Comparison with Org Agenda searches72856
-Node: org-sidebar73745
-Node: License74024
+Node: Contents1926
+Node: Screenshots2049
+Node: Installation2167
+Node: Quelpa2681
+Node: Helm support3209
+Node: Usage3612
+Node: Commands4010
+Node: org-ql-find4475
+Node: org-ql-open-link5383
+Node: org-ql-refile6238
+Node: org-ql-search6566
+Node: helm-org-ql8497
+Node: org-ql-view8875
+Node: org-ql-view-sidebar9405
+Node: org-ql-view-recent-items9785
+Node: org-ql-sparse-tree10281
+Node: Queries11081
+Node: Non-sexp query syntax12198
+Node: General predicates13957
+Node: Ancestor/descendant predicates20882
+Node: Date/time predicates22010
+Node: Functions / Macros25134
+Node: Agenda-like views25432
+Ref: Function org-ql-block25594
+Node: Listing / acting-on results26855
+Ref: Caching27063
+Ref: Function org-ql-select27976
+Ref: Function org-ql-query30402
+Ref: Macro org-ql (deprecated)32176
+Node: Custom predicates32491
+Ref: Macro org-ql-defpred32715
+Node: Dynamic block36156
+Node: Links38880
+Node: Tips39567
+Node: Changelog39891
+Node: 09-pre40782
+Node: 08440889
+Node: 08341344
+Node: 08241685
+Node: 08142078
+Node: 0842499
+Node: 07445223
+Node: 07345446
+Node: 07246178
+Node: 07147097
+Node: 0747908
+Node: 06350774
+Node: 06251307
+Node: 06151614
+Node: 0652184
+Node: 05255240
+Node: 05155542
+Node: 0555967
+Node: 04957498
+Node: 04857780
+Node: 04758129
+Node: 04658538
+Node: 04558946
+Node: 04459307
+Node: 04359666
+Node: 04259869
+Node: 04160030
+Node: 0460277
+Node: 03264378
+Node: 03164781
+Node: 0364978
+Node: 02368278
+Node: 02268512
+Node: 02168792
+Node: 0268997
+Node: 0173075
+Node: Notes73176
+Node: Comparison with Org Agenda searches73338
+Node: org-sidebar74227
+Node: License74506
 
 End Tag Table