diff --git a/navi/api/routes/sessions.py b/navi/api/routes/sessions.py
index 4143570..9fb286d 100644
--- a/navi/api/routes/sessions.py
+++ b/navi/api/routes/sessions.py
@@ -114,26 +114,36 @@
     limit: Annotated[int | None, Query(ge=1, le=100)] = None,
     offset: Annotated[int | None, Query(ge=0)] = None,
     profile_id: str | None = None,
+    search: str | None = Query(None),
 ) -> dict | list[dict]:
     is_admin = user.role == "admin" or user.has_permission("navi.sessions.read_all")
     if limit is None and offset is None:
         sessions = await store.list_all(user_id=user.id, is_admin=is_admin)
-        if profile_id:
+        if profile_id and not search:
             sessions = [s for s in sessions if s.profile_id == profile_id]
-        return [_session_summary(s) for s in sessions]
+        return [_session_summary(s, search=search) for s in sessions]
 
     page_limit = limit or 30
     page_offset = offset or 0
-    sessions = await store.list_page(
-        limit=page_limit + 1,
-        offset=page_offset,
-        profile_id=profile_id,
-        user_id=user.id,
-        is_admin=is_admin,
-    )
+    if search:
+        sessions = await store.search_list(
+            limit=page_limit + 1,
+            offset=page_offset,
+            user_id=user.id,
+            is_admin=is_admin,
+            search=search,
+        )
+    else:
+        sessions = await store.list_page(
+            limit=page_limit + 1,
+            offset=page_offset,
+            profile_id=profile_id,
+            user_id=user.id,
+            is_admin=is_admin,
+        )
     items = sessions[:page_limit]
     return {
-        "items": [_session_summary(s) for s in items],
+        "items": [_session_summary(s, search=search) for s in items],
         "limit": page_limit,
         "offset": page_offset,
         "has_more": len(sessions) > page_limit,
@@ -141,8 +151,8 @@
     }
 
 
-def _session_summary(session) -> dict:
-    return {
+def _session_summary(session, search: str | None = None) -> dict:
+    summary = {
         "session_id": session.id,
         "profile_id": session.profile_id,
         "name": session.name,
@@ -152,6 +162,9 @@
         "created_at": session.created_at.isoformat(),
         "last_active": session.last_active.isoformat(),
     }
+    if search:
+        summary["match_indices"], summary["match_preview"] = _match_info(session, search)
+    return summary
 
 
 def _preview(session) -> str:
@@ -162,6 +175,28 @@
     return ""
 
 
+def _match_info(session, search: str) -> tuple[list[int], str]:
+    """Return message indices that contain the search term and a preview snippet."""
+    q = search.lower()
+    indices = []
+    preview = ""
+    for i, msg in enumerate(session.messages):
+        content = msg.content or ""
+        if q in content.lower():
+            indices.append(i)
+            if not preview:
+                idx = content.lower().find(q)
+                start = max(0, idx - 30)
+                end = min(len(content), idx + len(search) + 30)
+                snippet = content[start:end]
+                if start > 0:
+                    snippet = "…" + snippet
+                if end < len(content):
+                    snippet = snippet + "…"
+                preview = snippet
+    return indices, preview
+
+
 @router.get("/{session_id}")
 async def get_session(
     session_id: str,
diff --git a/navi/core/pg_session_store.py b/navi/core/pg_session_store.py
index 54e6684..d7f3b01 100644
--- a/navi/core/pg_session_store.py
+++ b/navi/core/pg_session_store.py
@@ -197,7 +197,7 @@
             if search:
                 like = f"%{search}%"
                 conditions.append(
-                    f"(id ILIKE {add_param(like)} OR name ILIKE {add_param(like)} OR user_id ILIKE {add_param(like)} OR profile_id ILIKE {add_param(like)})"
+                    f"(id ILIKE {add_param(like)} OR name ILIKE {add_param(like)} OR user_id ILIKE {add_param(like)} OR profile_id ILIKE {add_param(like)} OR messages ILIKE {add_param(like)})"
                 )
 
             where = "WHERE " + " AND ".join(conditions) if conditions else ""
@@ -232,7 +232,7 @@
             if search:
                 like = f"%{search}%"
                 conditions.append(
-                    f"(id ILIKE {add_param(like)} OR name ILIKE {add_param(like)} OR user_id ILIKE {add_param(like)} OR profile_id ILIKE {add_param(like)})"
+                    f"(id ILIKE {add_param(like)} OR name ILIKE {add_param(like)} OR user_id ILIKE {add_param(like)} OR profile_id ILIKE {add_param(like)} OR messages ILIKE {add_param(like)})"
                 )
 
             where = "WHERE " + " AND ".join(conditions) if conditions else ""
diff --git a/navi/core/session.py b/navi/core/session.py
index 969e9d2..e0e263e 100644
--- a/navi/core/session.py
+++ b/navi/core/session.py
@@ -154,6 +154,7 @@
                 or (s.name and q in s.name.lower())
                 or (s.user_id and q in s.user_id.lower())
                 or (s.profile_id and q in s.profile_id.lower())
+                or any(q in (m.content or "").lower() for m in s.messages)
             ]
         key_map = {
             "created_at": lambda s: s.created_at,
diff --git a/webclient/src/api/index.js b/webclient/src/api/index.js
index a9f9da6..67d59f7 100644
--- a/webclient/src/api/index.js
+++ b/webclient/src/api/index.js
@@ -53,12 +53,13 @@
 }
 
 // ─── Sessions ──────────────────────────────────────────────────────────────
-export function getSessions({ limit = 30, offset = 0, profileId = null } = {}) {
+export function getSessions({ limit = 30, offset = 0, profileId = null, search = null } = {}) {
   const params = new URLSearchParams({
     limit: String(limit),
     offset: String(offset),
   })
   if (profileId) params.set('profile_id', profileId)
+  if (search) params.set('search', search)
   return request('GET', `/sessions?${params.toString()}`)
 }
 
diff --git a/webclient/src/components/chat/MessageList.vue b/webclient/src/components/chat/MessageList.vue
index 308dbc4..93dc607 100644
--- a/webclient/src/components/chat/MessageList.vue
+++ b/webclient/src/components/chat/MessageList.vue
@@ -4,9 +4,10 @@
       <div class="message-list-inner" :class="{ 'is-hidden': !contentVisible }">
         <div class="messages-group">
           <div
-            v-for="msg in chat.messages"
+            v-for="(msg, msgIndex) in chat.messages"
             :key="msg.id"
-            :class="{ 'msg-enter': msg.animate }"
+            :data-msg-index="msgIndex"
+            :class="{ 'msg-enter': msg.animate, 'msg-flash': flashIndex === msgIndex }"
           >
             <component :is="resolveComponent(msg)" :msg="msg" />
           </div>
@@ -40,8 +41,21 @@
 const containerEl = ref(null)
 const contentVisible = ref(false)
 const showScrollBtn = ref(false)
+const flashIndex = ref(null)
 let userScrolledUp = false
 
+function scrollToMessage(index) {
+  const el = containerEl.value
+  if (!el) return
+  const target = el.querySelector(`[data-msg-index="${index}"]`)
+  if (!target) return
+  target.scrollIntoView({ behavior: 'smooth', block: 'center' })
+  flashIndex.value = index
+  setTimeout(() => {
+    if (flashIndex.value === index) flashIndex.value = null
+  }, 1500)
+}
+
 function resolveComponent(msg) {
   if (msg.role === 'user') return UserMessage
   if (msg.type === 'summary') return SummaryCard
@@ -96,14 +110,19 @@
   }
 )
 
-// When session finishes loading: scroll to bottom while invisible, then reveal
+// When session finishes loading: scroll to target message or bottom, then reveal
 watch(
   () => chat.loading,
   (loading) => {
     if (!loading) {
       contentVisible.value = false
       afterLayout(() => {
-        scrollToBottom()
+        if (chat.scrollToMessageIndex != null) {
+          scrollToMessage(chat.scrollToMessageIndex)
+          chat.scrollToMessageIndex = null
+        } else {
+          scrollToBottom()
+        }
         contentVisible.value = true
       })
     }
diff --git a/webclient/src/components/sidebar/AppSidebar.vue b/webclient/src/components/sidebar/AppSidebar.vue
index 884c22e..2ad005c 100644
--- a/webclient/src/components/sidebar/AppSidebar.vue
+++ b/webclient/src/components/sidebar/AppSidebar.vue
@@ -27,9 +27,43 @@
       </div>
     </div>
 
+    <div class="sidebar-search" :class="{ 'is-open': searchOpen }">
+      <div class="sidebar-search-bar">
+        <GnIconButton
+          icon="ph ph-magnifying-glass"
+          label="Search"
+          class="search-toggle-btn"
+          :class="{ active: searchOpen || sessionsStore.searchActive }"
+          @click="toggleSearch"
+        />
+        <div v-if="searchOpen" class="search-input-wrap">
+          <input
+            ref="searchInputEl"
+            v-model="searchInput"
+            type="text"
+            placeholder="Search conversations..."
+            class="search-input"
+            @keydown.esc="closeSearch"
+          />
+          <GnIconButton
+            v-if="searchInput"
+            icon="ph ph-x"
+            label="Clear"
+            class="search-clear-btn"
+            @click="clearSearchInput"
+          />
+        </div>
+      </div>
+    </div>
+
     <div class="sidebar-sessions">
       <div class="sessions-header">
-        <div class="sessions-label">Conversations</div>
+        <div class="sessions-label">
+          <template v-if="sessionsStore.searchActive">
+            {{ sessionsStore.sessions.length }} result{{ sessionsStore.sessions.length === 1 ? '' : 's' }}
+          </template>
+          <template v-else>Conversations</template>
+        </div>
         <GnIconButton
           icon="ph ph-arrow-clockwise"
           label="Refresh"
@@ -82,7 +116,7 @@
 </template>
 
 <script setup>
-import { watch } from 'vue'
+import { ref, watch, onMounted, onBeforeUnmount } from 'vue'
 import { useProfilesStore } from '@/stores/profiles.js'
 import { useSessionsStore } from '@/stores/sessions.js'
 import { useChatStore } from '@/stores/chat.js'
@@ -99,24 +133,92 @@
 const chatStore = useChatStore()
 const authStore = useAuthStore()
 
+const searchOpen = ref(false)
+const searchInput = ref('')
+const searchInputEl = ref(null)
+let searchDebounceTimer = null
+
 // Keep selector in sync with the active session's profile
 watch(
   () => chatStore.currentProfileId,
   (id) => { if (id) profilesStore.selectedProfileId = id }
 )
 
+// Toggle search UI
+function toggleSearch() {
+  searchOpen.value = !searchOpen.value
+  if (searchOpen.value) {
+    // Restore previous query if any
+    if (sessionsStore.searchQuery) {
+      searchInput.value = sessionsStore.searchQuery
+    }
+    setTimeout(() => searchInputEl.value?.focus(), 50)
+  }
+}
+
+function closeSearch() {
+  searchOpen.value = false
+}
+
+function clearSearchInput() {
+  searchInput.value = ''
+  sessionsStore.clearSearch()
+  sessionsStore.fetchSessions(profilesStore.selectedProfileId)
+  searchInputEl.value?.focus()
+}
+
+// Debounced search
+watch(searchInput, (val) => {
+  if (searchDebounceTimer) clearTimeout(searchDebounceTimer)
+  if (!val) {
+    sessionsStore.clearSearch()
+    sessionsStore.fetchSessions(profilesStore.selectedProfileId)
+    return
+  }
+  searchDebounceTimer = setTimeout(() => {
+    sessionsStore.setSearch(val)
+    sessionsStore.fetchSessions()
+  }, 300)
+})
+
+// Close search when profile changes (but keep state)
+watch(
+  () => profilesStore.selectedProfileId,
+  () => {
+    searchOpen.value = false
+  }
+)
+
 async function handleNewSession() {
   const session = await sessionsStore.createSession(profilesStore.selectedProfileId)
   await chatStore.loadSession(session.session_id)
   emit('close')
 }
 
-function handleSelect() {
+async function handleSelect(session) {
+  // If selected from search, switch to the session's profile
+  if (sessionsStore.searchActive && session.profile_id) {
+    profilesStore.selectedProfileId = session.profile_id
+  }
+  await chatStore.loadSession(session.session_id, session.match_indices?.[0])
   emit('close')
 }
+
+// Keyboard shortcut: Ctrl/Cmd + K
+function onKeyDown(e) {
+  if ((e.ctrlKey || e.metaKey) && e.key === 'k') {
+    e.preventDefault()
+    toggleSearch()
+  }
+}
+
+onMounted(() => window.addEventListener('keydown', onKeyDown))
+onBeforeUnmount(() => window.removeEventListener('keydown', onKeyDown))
 </script>
 
-<style scoped>
+<style scoped lang="scss">
+@use 'kit-deps' as *;
+
 .sidebar-close-btn {
   display: none;
 
@@ -126,6 +228,71 @@
   }
 }
 
+.sidebar-search {
+  padding: 0 $space-md;
+  border-bottom: 1px solid var(--color-border);
+  display: none;
+}
+
+.sidebar-search.is-open {
+  display: block;
+  padding-top: $space-sm;
+  padding-bottom: $space-sm;
+}
+
+.sidebar-search-bar {
+  display: flex;
+  align-items: center;
+  gap: $space-xs;
+}
+
+.search-toggle-btn {
+  font-size: 14px;
+  color: $color-text-dark;
+  transition: color 0.15s;
+}
+
+.search-toggle-btn.active,
+.search-toggle-btn:hover {
+  color: $color-text-light;
+}
+
+.search-input-wrap {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  gap: $space-xs;
+  position: relative;
+}
+
+.search-input {
+  flex: 1;
+  min-width: 0;
+  background: $surface-panel-muted;
+  border: $border-width-base $border-style-base $border-color-muted;
+  border-bottom-width: $border-width-accent;
+  border-bottom-color: $color-text-light;
+  color: $color-text-light;
+  font-size: 13px;
+  padding: $space-xs $space-sm;
+  outline: none;
+  font-family: inherit;
+  transition: border-color $motion-base $motion-ease;
+}
+
+.search-input:focus {
+  border-color: $color-secondary;
+}
+
+.search-input::placeholder {
+  color: $color-text-dark;
+}
+
+.search-clear-btn {
+  font-size: 12px;
+  color: $color-text-dark;
+}
+
 .sidebar-footer {
   padding: 12px 16px;
   border-top: 1px solid var(--color-border);
diff --git a/webclient/src/components/sidebar/SessionItem.vue b/webclient/src/components/sidebar/SessionItem.vue
index 5486520..2d2e3c1 100644
--- a/webclient/src/components/sidebar/SessionItem.vue
+++ b/webclient/src/components/sidebar/SessionItem.vue
@@ -7,8 +7,8 @@
     <i class="ph ph-push-pin session-pin-icon"></i>
 
     <div class="session-info">
-      <div class="session-name">{{ displayName }}</div>
-      <div v-if="session.preview" class="session-preview">{{ session.preview }}</div>
+      <div class="session-name" v-html="highlightedName"></div>
+      <div v-if="displayPreview" class="session-preview" v-html="highlightedPreview"></div>
       <div v-if="sessionTime" class="session-time">{{ sessionTime }}</div>
     </div>
 
@@ -38,7 +38,8 @@
 
 const props = defineProps({
   session: { type: Object, required: true },
-  active: { type: Boolean, default: false }
+  active: { type: Boolean, default: false },
+  searchQuery: { type: String, default: '' }
 })
 
 const emit = defineEmits(['select', 'delete', 'pin'])
@@ -50,11 +51,59 @@
   return props.session.name || id.slice(0, 8)
 })
 
+const displayPreview = computed(() => {
+  if (props.searchQuery && props.session.match_preview) {
+    return props.session.match_preview
+  }
+  return props.session.preview
+})
+
 const tsRef = computed(() => props.session.last_active)
 const sessionTime = useTimeLabel(tsRef)
 
+function escapeHtml(str) {
+  if (typeof str !== 'string') return String(str ?? '')
+  return str
+    .replace(/&/g, '&amp;')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+}
+
+function highlightText(text, query) {
+  if (!query || !text) return escapeHtml(text)
+  const q = escapeHtml(query.toLowerCase())
+  const t = escapeHtml(text)
+  const parts = []
+  let lastIndex = 0
+  const lower = t.toLowerCase()
+  while (true) {
+    const idx = lower.indexOf(q, lastIndex)
+    if (idx === -1) break
+    if (idx > lastIndex) parts.push(t.slice(lastIndex, idx))
+    parts.push(`<mark class="search-highlight">${t.slice(idx, idx + query.length)}</mark>`)
+    lastIndex = idx + query.length
+  }
+  if (lastIndex < t.length) parts.push(t.slice(lastIndex))
+  return parts.join('')
+}
+
+const highlightedName = computed(() => highlightText(displayName.value, props.searchQuery))
+const highlightedPreview = computed(() => highlightText(displayPreview.value, props.searchQuery))
+
 async function onDelete() {
   const ok = await confirm('Delete this conversation?')
   if (ok) emit('delete')
 }
 </script>
+
+<style scoped lang="scss">
+@use 'kit-deps' as *;
+
+.search-highlight {
+  background: rgba($color-secondary, 0.25);
+  color: $color-secondary;
+  font-weight: 600;
+  padding: 0 2px;
+  border-radius: 2px;
+}
+</style>
diff --git a/webclient/src/components/sidebar/SessionList.vue b/webclient/src/components/sidebar/SessionList.vue
index ec27114..67f8953 100644
--- a/webclient/src/components/sidebar/SessionList.vue
+++ b/webclient/src/components/sidebar/SessionList.vue
@@ -49,6 +49,7 @@
           <SessionItem
             :session="item"
             :active="item.session_id === chatStore.currentId"
+            :search-query="sessionsStore.searchQuery"
             @select="onSelect(item)"
             @delete="onDelete(item)"
             @pin="onPin(item)"
diff --git a/webclient/src/stores/chat.js b/webclient/src/stores/chat.js
index 3438d82..efcc1ba 100644
--- a/webclient/src/stores/chat.js
+++ b/webclient/src/stores/chat.js
@@ -35,9 +35,11 @@
   const streamingMsg = shallowRef(null)
   // True while replaying buffered events from a reconnect — suppresses animations
   const replayMode = ref(false)
+  // Index of the message to scroll to after loading a session from search results
+  const scrollToMessageIndex = ref(null)
 
-  async function loadSession(id) {
-    if (currentId.value === id) return
+  async function loadSession(id, targetIndex = null) {
+    if (currentId.value === id && targetIndex == null) return
     _lastLoadId = id
     loading.value = true
     messages.value = []
@@ -47,6 +49,7 @@
     streamingMsg.value = null
     contextTokens.value = 0
     maxContextTokens.value = 0
+    scrollToMessageIndex.value = targetIndex
 
     try {
       const session = await api.getSession(id)
@@ -594,6 +597,7 @@
     maxContextTokens,
     loading,
     streamingMsg,
+    scrollToMessageIndex,
     loadSession,
     clearSession,
     reloadSession,
diff --git a/webclient/src/stores/sessions.js b/webclient/src/stores/sessions.js
index e067c04..0e914d3 100644
--- a/webclient/src/stores/sessions.js
+++ b/webclient/src/stores/sessions.js
@@ -10,12 +10,19 @@
   const hasMore = ref(true)
   const nextOffset = ref(0)
   const currentProfileId = ref(null)
+  const searchQuery = ref('')
+  const searchActive = ref(false)
 
   async function fetchSessions(profileId = null) {
     currentProfileId.value = profileId
     loading.value = true
     try {
-      const page = await api.getSessions({ limit: pageSize, offset: 0, profileId })
+      const page = await api.getSessions({
+        limit: pageSize,
+        offset: 0,
+        profileId: searchActive.value ? null : profileId,
+        search: searchActive.value ? searchQuery.value : null,
+      })
       const items = Array.isArray(page) ? page : page.items
       sessions.value = items
       hasMore.value = Array.isArray(page) ? false : page.has_more
@@ -32,7 +39,8 @@
       const page = await api.getSessions({
         limit: pageSize,
         offset: nextOffset.value,
-        profileId: currentProfileId.value,
+        profileId: searchActive.value ? null : currentProfileId.value,
+        search: searchActive.value ? searchQuery.value : null,
       })
       const items = Array.isArray(page) ? page : page.items
       const known = new Set(sessions.value.map(s => s.session_id))
@@ -47,6 +55,16 @@
     }
   }
 
+  function setSearch(query) {
+    searchQuery.value = query
+    searchActive.value = query.length > 0
+  }
+
+  function clearSearch() {
+    searchQuery.value = ''
+    searchActive.value = false
+  }
+
   async function createSession(profileId) {
     const session = await api.createSession(profileId)
     // Add a complete placeholder so SessionItem renders correctly immediately
@@ -96,12 +114,16 @@
     loadingMore,
     hasMore,
     currentProfileId,
+    searchQuery,
+    searchActive,
     fetchSessions,
     fetchMoreSessions,
     createSession,
     deleteSession,
     pinSession,
     updatePreview,
-    updateName
+    updateName,
+    setSearch,
+    clearSearch
   }
 })
diff --git a/webclient/src/styles/app.scss b/webclient/src/styles/app.scss
index 2cc96d5..fa3c0ef 100644
--- a/webclient/src/styles/app.scss
+++ b/webclient/src/styles/app.scss
@@ -1679,3 +1679,14 @@
 .thinking-card[open] > summary .tool-chevron {
   transform: rotate(180deg) !important;
 }
+
+// ─── Search result message flash ────────────────────────────────────────────
+.msg-flash {
+  animation: msgFlash 1.5s ease both;
+}
+
+@keyframes msgFlash {
+  0%   { filter: brightness(1); }
+  20%  { filter: brightness(1.35); }
+  100% { filter: brightness(1); }
+}
diff --git a/webclient/tests/unit/stores/sessions.test.js b/webclient/tests/unit/stores/sessions.test.js
index 5188994..16eff96 100644
--- a/webclient/tests/unit/stores/sessions.test.js
+++ b/webclient/tests/unit/stores/sessions.test.js
@@ -25,7 +25,7 @@
     })
     const store = useSessionsStore()
     await store.fetchSessions('developer')
-    expect(api.getSessions).toHaveBeenCalledWith({ limit: 30, offset: 0, profileId: 'developer' })
+    expect(api.getSessions).toHaveBeenCalledWith({ limit: 30, offset: 0, profileId: 'developer', search: null })
     expect(store.sessions).toHaveLength(1)
     expect(store.sessions[0].session_id).toBe('s1')
     expect(store.hasMore).toBe(true)
@@ -48,7 +48,7 @@
     const store = useSessionsStore()
     await store.fetchSessions('developer')
     await store.fetchMoreSessions()
-    expect(api.getSessions).toHaveBeenLastCalledWith({ limit: 30, offset: 1, profileId: 'developer' })
+    expect(api.getSessions).toHaveBeenLastCalledWith({ limit: 30, offset: 1, profileId: 'developer', search: null })
     expect(store.sessions.map(s => s.session_id)).toEqual(['s1', 's2'])
     expect(store.hasMore).toBe(false)
     expect(store.loadingMore).toBe(false)