diff --git a/webclient/src/components/sidebar/AppSidebar.vue b/webclient/src/components/sidebar/AppSidebar.vue
index c07af6e..630b80b 100644
--- a/webclient/src/components/sidebar/AppSidebar.vue
+++ b/webclient/src/components/sidebar/AppSidebar.vue
@@ -28,7 +28,10 @@
     </div>
 
     <div class="sidebar-search" :class="{ 'is-open': searchOpen }">
-      <div class="sidebar-search-inner">
+      <div
+        class="sidebar-search-inner"
+        :class="{ 'is-loading': sessionsStore.loading && sessionsStore.searchActive }"
+      >
         <GnSearchField
           v-model="searchInput"
           placeholder="Search conversations..."
@@ -44,11 +47,7 @@
       <div class="sessions-header">
         <div class="sessions-label">
           <template v-if="sessionsStore.searchActive">
-            <span>{{ sessionsStore.sessions.length }} result{{ sessionsStore.sessions.length === 1 ? '' : 's' }}</span>
-            <span
-              v-if="sessionsStore.loading"
-              class="search-spinner"
-            ></span>
+            {{ sessionsStore.sessions.length }} result{{ sessionsStore.sessions.length === 1 ? '' : 's' }}
           </template>
           <template v-else>Conversations</template>
         </div>
@@ -69,7 +68,7 @@
           />
         </div>
       </div>
-      <SessionList :search-open="searchOpen" @select="handleSelect" />
+      <SessionList @select="handleSelect" />
     </div>
 
     <div class="sidebar-footer">
@@ -145,14 +144,20 @@
   searchOpen.value = !searchOpen.value
   if (searchOpen.value && sessionsStore.searchQuery) {
     searchInput.value = sessionsStore.searchQuery
+    sessionsStore.setSearch(sessionsStore.searchQuery)
+    sessionsStore.fetchSessions()
   }
 }
 
 function closeSearch() {
+  if (!searchOpen.value) return
   searchOpen.value = false
+  sessionsStore.exitSearch()
+  sessionsStore.fetchSessions(profilesStore.selectedProfileId)
 }
 
 function onSearchClear() {
+  searchInput.value = ''
   sessionsStore.clearSearch()
   sessionsStore.fetchSessions(profilesStore.selectedProfileId)
 }
@@ -175,7 +180,11 @@
 watch(
   () => profilesStore.selectedProfileId,
   () => {
-    searchOpen.value = false
+    if (searchOpen.value) {
+      searchOpen.value = false
+      sessionsStore.exitSearch()
+      sessionsStore.fetchSessions(profilesStore.selectedProfileId)
+    }
   }
 )
 
@@ -192,6 +201,8 @@
   }
   await chatStore.loadSession(session.session_id, session.match_indices?.[0])
   searchOpen.value = false
+  sessionsStore.exitSearch()
+  sessionsStore.fetchSessions(profilesStore.selectedProfileId)
   emit('close')
 }
 
@@ -232,6 +243,7 @@
 }
 
 .sidebar-search-inner {
+  position: relative;
   display: flex;
   align-items: center;
   gap: $space-xs;
@@ -240,17 +252,27 @@
     flex: 1;
     min-width: 0;
   }
-}
 
-.search-spinner {
-  display: inline-block;
-  width: 14px;
-  height: 14px;
-  border: 2px solid $border-color-muted;
-  border-top-color: $color-secondary;
-  border-radius: 50%;
-  animation: spin 0.6s linear infinite;
-  flex-shrink: 0;
+  &.is-loading :deep(.input-group-addon) {
+    position: relative;
+  }
+
+  &.is-loading :deep(.input-group-addon .ph) {
+    visibility: hidden;
+  }
+
+  &.is-loading :deep(.input-group-addon)::after {
+    content: '';
+    position: absolute;
+    inset: 0;
+    margin: auto;
+    width: 12px;
+    height: 12px;
+    border: 2px solid $border-color-muted;
+    border-top-color: $color-secondary;
+    border-radius: 50%;
+    animation: spin 0.6s linear infinite;
+  }
 }
 
 .sessions-header-actions {
diff --git a/webclient/src/components/sidebar/SessionList.vue b/webclient/src/components/sidebar/SessionList.vue
index 46ea870..67f8953 100644
--- a/webclient/src/components/sidebar/SessionList.vue
+++ b/webclient/src/components/sidebar/SessionList.vue
@@ -49,7 +49,7 @@
           <SessionItem
             :session="item"
             :active="item.session_id === chatStore.currentId"
-            :search-query="props.searchOpen ? sessionsStore.searchQuery : ''"
+            :search-query="sessionsStore.searchQuery"
             @select="onSelect(item)"
             @delete="onDelete(item)"
             @pin="onPin(item)"
@@ -76,9 +76,6 @@
 import { useProfilesStore } from '@/stores/profiles.js'
 import SessionItem from './SessionItem.vue'
 
-const props = defineProps({
-  searchOpen: { type: Boolean, default: false }
-})
 const emit = defineEmits(['select'])
 
 const sessionsStore = useSessionsStore()
diff --git a/webclient/src/stores/sessions.js b/webclient/src/stores/sessions.js
index 0e914d3..371b71a 100644
--- a/webclient/src/stores/sessions.js
+++ b/webclient/src/stores/sessions.js
@@ -65,6 +65,10 @@
     searchActive.value = false
   }
 
+  function exitSearch() {
+    searchActive.value = false
+  }
+
   async function createSession(profileId) {
     const session = await api.createSession(profileId)
     // Add a complete placeholder so SessionItem renders correctly immediately
@@ -124,6 +128,7 @@
     updatePreview,
     updateName,
     setSearch,
-    clearSearch
+    clearSearch,
+    exitSearch
   }
 })
diff --git a/webclient/src/styles/app.scss b/webclient/src/styles/app.scss
index 1d23680..fd3d1e0 100644
--- a/webclient/src/styles/app.scss
+++ b/webclient/src/styles/app.scss
@@ -1682,12 +1682,12 @@
 
 // ─── Search result message flash ────────────────────────────────────────────
 .msg-flash {
-  animation: msgFlash 2.5s ease-out both;
+  animation: msgFlash 2.5s ease-out;
 }
 
 @keyframes msgFlash {
-  0%   { filter: brightness(1); background-color: transparent; }
+  0%   { filter: brightness(1); }
   15%  { filter: brightness(1.4); background-color: rgba($color-secondary, 0.12); }
   40%  { filter: brightness(1.4); background-color: rgba($color-secondary, 0.12); }
-  100% { filter: brightness(1); background-color: transparent; }
+  100% { filter: brightness(1); }
 }