diff --git a/docs/changelog.txt b/docs/changelog.txt
index 8a740a670..589952305 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -58,6 +58,7 @@ Template for new versions:
 ## New Features
 - `logistics`: ``automelt`` now optionally supports melting masterworks; feature accessible from `stockpiles` overlay
 - `sort`: new search widgets for Info panel tabs, including all "Creatures" subtabs, all "Objects" subtabs, "Tasks", the "Work details" subtab under "Labor", and the "Interrogate" and "Convict" screens under "Justice"
+- `sort`: new search widgets for location selection screen (when you're choosing what kind of guildhall or temple to dedicate)
 
 ## Fixes
 - `zone`: don't show animal assignment link for dungeon cages/restraints
diff --git a/docs/plugins/sort.rst b/docs/plugins/sort.rst
index 70e101b3f..21a2acacf 100644
--- a/docs/plugins/sort.rst
+++ b/docs/plugins/sort.rst
@@ -92,8 +92,8 @@ https://www.reddit.com/r/dwarffortress/comments/163kczo/enhancing_military_candi
 "Mental stability" is explained here:
 https://www.reddit.com/r/dwarffortress/comments/1617s11/enhancing_military_candidate_selection_part_2/
 
-Info overlay
-------------
+Info tabs overlay
+-----------------
 
 The Info overlay adds search support to many of the fort-wide "Info" panels
 (e.g. "Creatures", "Tasks", etc.). When searching for units, you can search by
@@ -102,13 +102,21 @@ special status (like "necromancer"). If there is text in the second column, you
 can search for that text as well. This is often a job name or a status, like
 "caged".
 
+Interrogation overlay
+---------------------
+
 In the interrogation and conviction screens under the "Justice" tab, you can
-also filter by the classification of the unit. The classification groups are
-ordered by how likely a member of that group is to be involved in a plot. The
-groups are: All, Risky visitors, Other visitors, Residents, Citizens, Animals,
-Deceased, and Others. "Risky" visitors are those who are especially likely to
-be involved in plots, such as criminals, necromancers, necromancer experiments,
-and intelligent undead.
+search for units by name. You can also filter by the classification of the
+unit. The classification groups are ordered by how likely a member of that
+group is to be involved in a plot. The groups are: All, Risky visitors, Other
+visitors, Residents, Citizens, Animals, Deceased, and Others. "Risky" visitors are those who are especially likely to be involved in plots, such as criminals,
+necromancers, necromancer experiments, and intelligent undead.
 
 On the interrogations screen, you can also filter units by whether they have
 already been interrogated.
+
+Location selection overlay
+--------------------------
+
+When choosing the type of guildhall or temple to dedicate, you can search for
+the relevant profession, religion, or deity by name.
diff --git a/plugins/lua/sort/sortoverlay.lua b/plugins/lua/sort/sortoverlay.lua
index b3067a8ba..229fd2559 100644
--- a/plugins/lua/sort/sortoverlay.lua
+++ b/plugins/lua/sort/sortoverlay.lua
@@ -21,6 +21,8 @@ SortOverlay.ATTRS{
     hotspot=true,
     overlay_onupdate_max_freq_seconds=0,
     -- subclasses expected to provide default_pos, viewscreens (single string), and frame
+    -- viewscreens should be the top-level scope within which the search widget state is maintained
+    -- once the player leaves that scope, widget state will be reset
 }
 
 function SortOverlay:init()