diff --git a/plugins/lua/sort/info.lua b/plugins/lua/sort/info.lua
index 7f9b49b7b..318438cf1 100644
--- a/plugins/lua/sort/info.lua
+++ b/plugins/lua/sort/info.lua
@@ -336,6 +336,11 @@ function InfoOverlay:init()
     end
 end
 
+function InfoOverlay:reset()
+    InfoOverlay.super.reset(self)
+    self.subviews.subset:setOption('all')
+end
+
 function InfoOverlay:get_key()
     if info.current_mode == df.info_interface_mode_type.CREATURES then
         if creatures.current_mode == df.unit_list_mode_type.PET then
diff --git a/plugins/lua/sort/unitselector.lua b/plugins/lua/sort/unitselector.lua
index 377ef0551..25228386c 100644
--- a/plugins/lua/sort/unitselector.lua
+++ b/plugins/lua/sort/unitselector.lua
@@ -247,6 +247,11 @@ function BurrowAssignmentOverlay:register_handlers()
     end
 end
 
+function BurrowAssignmentOverlay:reset()
+    BurrowAssignmentOverlay.super.reset(self)
+    self.subviews.subset:setOption('all')
+end
+
 function BurrowAssignmentOverlay:matches_filters(unit_id)
     local unit = df.unit.find(unit_id)
     if not unit then return false end