diff --git a/web/apps/photos/src/components/SearchBar.tsx b/web/apps/photos/src/components/SearchBar.tsx
index 52c6b1a0cb..979e660e37 100644
--- a/web/apps/photos/src/components/SearchBar.tsx
+++ b/web/apps/photos/src/components/SearchBar.tsx
@@ -65,8 +65,8 @@ interface SearchBarProps {
     isInSearchMode: boolean;
     setIsInSearchMode: (v: boolean) => void;
     collections: Collection[];
-    updateSearch: UpdateSearch;
     files: EnteFile[];
+    updateSearch: UpdateSearch;
 }
 
 export type UpdateSearch = (
diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx
index 761f6cb32f..2950e7c30f 100644
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@ -972,16 +972,13 @@ export default function Gallery() {
     const updateSearch: UpdateSearch = (newSearch, summary) => {
         if (newSearch?.collection) {
             setActiveCollectionID(newSearch?.collection);
+            setIsInSearchMode(false);
         } else {
             setSearchQuery(newSearch);
-        }
-        setIsClipSearchResult(!!newSearch?.clip);
-        if (!newSearch?.collection) {
             setIsInSearchMode(!!newSearch);
             setSetSearchResultSummary(summary);
-        } else {
-            setIsInSearchMode(false);
         }
+        setIsClipSearchResult(!!newSearch?.clip);
     };
 
     const openUploader = (intent?: UploadTypeSelectorIntent) => {