diff --git a/src/hooks/navigator/useNavigatorSearch.ts b/src/hooks/navigator/useNavigatorSearch.ts
index ab3744d..7f55479 100644
--- a/src/hooks/navigator/useNavigatorSearch.ts
+++ b/src/hooks/navigator/useNavigatorSearch.ts
@@ -1,4 +1,5 @@
-import { NavigatorSearchComposer, NavigatorSearchEvent, NavigatorSearchResultSet } from '@nitrots/nitro-renderer';
+import { FlatCreatedEvent, NavigatorSearchComposer, NavigatorSearchEvent, NavigatorSearchResultSet } from '@nitrots/nitro-renderer';
+import { useQueryClient } from '@tanstack/react-query';
 import { useEffect, useState } from 'react';
 import { SendMessageComposer } from '../../api';
 import { useMessageEvent } from '../events';
@@ -9,6 +10,7 @@ export const useNavigatorSearch = () =>
 {
     const tabCode = useNavigatorUiStore(s => s.currentTabCode);
     const filter  = useNavigatorUiStore(s => s.currentFilter);
+    const queryClient = useQueryClient();
 
     const [ searchResult, setSearchResult ] = useState<NavigatorSearchResultSet | null>(null);
     const [ isFetching, setIsFetching ] = useState(false);
@@ -26,12 +28,25 @@ export const useNavigatorSearch = () =>
         const result = event.getParser()?.result;
         if(!result) return;
 
-        if(tabCode && result.code !== tabCode) return;
+        // No active tab → the search query is disabled, ignore any event.
+        // Otherwise only accept the event whose code matches the active tab.
+        if(!tabCode || (result.code !== tabCode)) return;
 
         setSearchResult(result);
         setIsFetching(false);
     });
 
+    // A newly created room invalidates the current search so it refetches.
+    useMessageEvent<FlatCreatedEvent>(FlatCreatedEvent, () =>
+    {
+        queryClient.invalidateQueries({ queryKey: [ 'navigator', 'search' ] });
+
+        if(!tabCode) return;
+
+        setIsFetching(true);
+        SendMessageComposer(new NavigatorSearchComposer(tabCode, filter));
+    });
+
     return {
         searchResult,
         isFetching,