diff --git a/web/src/lib/components/shared-components/search-bar/search-bar.svelte b/web/src/lib/components/shared-components/search-bar/search-bar.svelte
index 2f52423043..e5a9e60ad1 100644
--- a/web/src/lib/components/shared-components/search-bar/search-bar.svelte
+++ b/web/src/lib/components/shared-components/search-bar/search-bar.svelte
@@ -111,6 +111,7 @@
     if (close) {
       await close();
       close = undefined;
+      searchStore.isSearchEnabled = false;
       return;
     }
 
@@ -120,6 +121,7 @@
 
     const searchResult = await result.onClose;
     close = undefined;
+    searchStore.isSearchEnabled = false;
 
     // Refresh search type after modal closes
     getSearchType();
@@ -346,18 +348,6 @@
       </div>
     {/if}
 
-    <div class="absolute inset-y-0 {showClearIcon ? 'end-14' : 'end-2'} flex items-center ps-6 transition-all">
-      <IconButton
-        aria-label={$t('show_search_options')}
-        shape="round"
-        icon={mdiTune}
-        onclick={onFilterClick}
-        size="medium"
-        color="secondary"
-        variant="ghost"
-      />
-    </div>
-
     {#if showClearIcon}
       <div class="absolute inset-y-0 end-0 flex items-center pe-2">
         <IconButton
@@ -384,4 +374,16 @@
       />
     </div>
   </form>
+
+  <div class="absolute inset-y-0 {showClearIcon ? 'end-14' : 'end-2'} flex items-center ps-6 transition-all">
+    <IconButton
+      aria-label={$t('show_search_options')}
+      shape="round"
+      icon={mdiTune}
+      onclick={onFilterClick}
+      size="medium"
+      color="secondary"
+      variant="ghost"
+    />
+  </div>
 </div>