diff --git a/webclient/src/components/chat/MessageList.vue b/webclient/src/components/chat/MessageList.vue
index a797408..dc9bf9d 100644
--- a/webclient/src/components/chat/MessageList.vue
+++ b/webclient/src/components/chat/MessageList.vue
@@ -7,9 +7,9 @@
             v-for="(msg, msgIndex) in chat.messages"
             :key="msg.id"
             :data-msg-index="msgIndex"
-            :class="{ 'msg-enter': msg.animate, 'msg-flash': flashIndex === msgIndex }"
+            :class="{ 'msg-enter': msg.animate }"
           >
-            <component :is="resolveComponent(msg)" :msg="msg" />
+            <component :is="resolveComponent(msg)" :msg="msg" :is-flashing="flashIndex === msgIndex" />
           </div>
         </div>
       </div>
@@ -44,15 +44,17 @@
 const flashIndex = ref(null)
 let userScrolledUp = false
 
-function scrollToMessage(index) {
+function scrollToMessage(rawIndex) {
   const el = containerEl.value
   if (!el) return
-  const target = el.querySelector(`[data-msg-index="${index}"]`)
+  const msgIndex = chat.messages.findIndex(m => m.rawIndices?.includes(rawIndex))
+  if (msgIndex === -1) return
+  const target = el.querySelector(`[data-msg-index="${msgIndex}"]`)
   if (!target) return
   target.scrollIntoView({ behavior: 'smooth', block: 'center' })
-  flashIndex.value = index
+  flashIndex.value = msgIndex
   setTimeout(() => {
-    if (flashIndex.value === index) flashIndex.value = null
+    if (flashIndex.value === msgIndex) flashIndex.value = null
   }, 3000)
 }
 
diff --git a/webclient/src/components/messages/AssistantMessage.vue b/webclient/src/components/messages/AssistantMessage.vue
index ab02c3c..1687154 100644
--- a/webclient/src/components/messages/AssistantMessage.vue
+++ b/webclient/src/components/messages/AssistantMessage.vue
@@ -44,6 +44,7 @@
       v-if="msg.text"
       ref="contentEl"
       class="msg-assistant-content"
+      :class="{ 'msg-flash': props.isFlashing }"
       v-html="renderedText"
     />
 
@@ -110,7 +111,10 @@
 import { useCopy } from '@/composables/useCopy.js'
 import { useChatStore } from '@/stores/chat.js'
 
-const props = defineProps({ msg: { type: Object, required: true } })
+const props = defineProps({
+  msg: { type: Object, required: true },
+  isFlashing: { type: Boolean, default: false }
+})
 
 const contentEl = ref(null)
 const chat = useChatStore()
diff --git a/webclient/src/components/messages/UserMessage.vue b/webclient/src/components/messages/UserMessage.vue
index ec4319d..5bc8d89 100644
--- a/webclient/src/components/messages/UserMessage.vue
+++ b/webclient/src/components/messages/UserMessage.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="msg-user">
     <div class="msg-user-wrap">
-      <div class="msg-user-bubble">
+      <div class="msg-user-bubble" :class="{ 'msg-flash': props.isFlashing }">
         <div class="msg-user-text" v-html="renderUserText(msg.text)"></div>
         <div v-if="msg.images?.length || msg.files?.length" class="msg-user-attachments">
           <img
@@ -40,7 +40,10 @@
 import { useLightbox } from '@/composables/useLightbox.js'
 import { useCopy } from '@/composables/useCopy.js'
 
-const props = defineProps({ msg: { type: Object, required: true } })
+const props = defineProps({
+  msg: { type: Object, required: true },
+  isFlashing: { type: Boolean, default: false }
+})
 
 const tsRef = computed(() => props.msg.time)
 const msgTime = useTimeLabel(tsRef)
diff --git a/webclient/src/components/sidebar/AppSidebar.vue b/webclient/src/components/sidebar/AppSidebar.vue
index ccccf02..c07af6e 100644
--- a/webclient/src/components/sidebar/AppSidebar.vue
+++ b/webclient/src/components/sidebar/AppSidebar.vue
@@ -37,10 +37,6 @@
           @clear="onSearchClear"
           @keydown.esc="closeSearch"
         />
-        <span
-          v-if="sessionsStore.loading && sessionsStore.searchActive"
-          class="search-spinner"
-        ></span>
       </div>
     </div>
 
@@ -48,7 +44,11 @@
       <div class="sessions-header">
         <div class="sessions-label">
           <template v-if="sessionsStore.searchActive">
-            {{ sessionsStore.sessions.length }} result{{ sessionsStore.sessions.length === 1 ? '' : 's' }}
+            <span>{{ sessionsStore.sessions.length }} result{{ sessionsStore.sessions.length === 1 ? '' : 's' }}</span>
+            <span
+              v-if="sessionsStore.loading"
+              class="search-spinner"
+            ></span>
           </template>
           <template v-else>Conversations</template>
         </div>
@@ -69,7 +69,7 @@
           />
         </div>
       </div>
-      <SessionList @select="handleSelect" />
+      <SessionList :search-open="searchOpen" @select="handleSelect" />
     </div>
 
     <div class="sidebar-footer">
diff --git a/webclient/src/components/sidebar/SessionList.vue b/webclient/src/components/sidebar/SessionList.vue
index 67f8953..46ea870 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="sessionsStore.searchQuery"
+            :search-query="props.searchOpen ? sessionsStore.searchQuery : ''"
             @select="onSelect(item)"
             @delete="onDelete(item)"
             @pin="onPin(item)"
@@ -76,6 +76,9 @@
 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/chat.js b/webclient/src/stores/chat.js
index efcc1ba..ea2e922 100644
--- a/webclient/src/stores/chat.js
+++ b/webclient/src/stores/chat.js
@@ -478,7 +478,7 @@
       if (m.role === 'system') { i++; continue }
 
       if (m.is_summary) {
-        result.push({ id: `h_${i}`, role: 'assistant', type: 'summary', text: m.content ?? '' })
+        result.push({ id: `h_${i}`, role: 'assistant', type: 'summary', text: m.content ?? '', rawIndices: [i] })
         i++; continue
       }
 
@@ -486,7 +486,7 @@
         const imgs = (m.images ?? []).map(b =>
           (typeof b === 'string' && b.startsWith('data:')) ? b : `data:image/jpeg;base64,${String(b ?? '')}`
         )
-        result.push({ id: `h_${i}`, role: 'user', text: m.content ?? '', images: imgs, files: m.files ?? [], time: m.created_at ?? null })
+        result.push({ id: `h_${i}`, role: 'user', text: m.content ?? '', images: imgs, files: m.files ?? [], time: m.created_at ?? null, rawIndices: [i] })
         i++; continue
       }
 
@@ -572,7 +572,7 @@
             if (am.tool_call_count != null) tool_call_count = am.tool_call_count
             if (am.token_count     != null) token_count     = am.token_count
           }
-          result.push({ id: msgId, role: 'assistant', type: 'history', thinking, tools, text, done: true, time, elapsed_seconds, tool_call_count, token_count })
+          result.push({ id: msgId, role: 'assistant', type: 'history', thinking, tools, text, done: true, time, elapsed_seconds, tool_call_count, token_count, rawIndices: Array.from({ length: i - firstIdx }, (_, j) => firstIdx + j) })
         }
         continue
       }