diff --git a/kitty/boss.py b/kitty/boss.py
index b7de57897..ee58baeb8 100644
--- a/kitty/boss.py
+++ b/kitty/boss.py
@@ -535,6 +535,7 @@ class Boss:
             if tm is not None:
                 tab = tm.active_tab
         window_id_limit = max(self.window_id_map, default=-1) + 1
+        active_session = self.active_session
 
         def get_matches(location: str, query: str, candidates: set[int]) -> set[int]:
             if location == 'id' and query.startswith('-'):
@@ -544,7 +545,7 @@ class Boss:
                     return set()
                 if q < 0:
                     query = str(window_id_limit + q)
-            return {wid for wid in candidates if self.window_id_map[wid].matches_query(location, query, tab, self_window)}
+            return {wid for wid in candidates if self.window_id_map[wid].matches_query(location, query, tab, self_window, active_session)}
 
         for wid in search(match, (
             'id', 'title', 'pid', 'cwd', 'cmdline', 'num', 'env', 'var', 'recent', 'state', 'neighbor',
diff --git a/kitty/window.py b/kitty/window.py
index 096078985..85a4fa988 100644
--- a/kitty/window.py
+++ b/kitty/window.py
@@ -888,7 +888,7 @@ class Window:
     def has_running_program(self) -> bool:
         return not self.at_prompt
 
-    def matches(self, field: str, pat: MatchPatternType) -> bool:
+    def matches(self, field: str, pat: MatchPatternType, active_session: str) -> bool:
         if isinstance(pat, tuple):
             if field == 'env':
                 return key_val_matcher(self.child.environ.items(), *pat)
@@ -911,11 +911,14 @@ class Window:
             return False
         if field == 'session':
             if pat.pattern == '.':
-                return self.created_in_session_name == get_boss().active_session
+                return self.created_in_session_name == active_session
             return pat.search(self.created_in_session_name) is not None
         return False
 
-    def matches_query(self, field: str, query: str, active_tab: TabType | None = None, self_window: Optional['Window'] = None) -> bool:
+    def matches_query(
+        self, field: str, query: str, active_tab: TabType | None = None,
+        self_window: Optional['Window'] = None, active_session: str = ''
+    ) -> bool:
         if field in ('num', 'recent'):
             if active_tab is not None:
                 try:
@@ -964,7 +967,7 @@ class Window:
             return gid is not None and t.windows.active_window_in_group_id(gid) is self
 
         pat = compile_match_query(query, field not in ('env', 'var'))
-        return self.matches(field, pat)
+        return self.matches(field, pat, active_session)
 
     def set_visible_in_layout(self, val: bool) -> None:
         val = bool(val)