diff --git a/src/components/conversations/search-command-dialog.tsx b/src/components/conversations/search-command-dialog.tsx
index ebc1fd7..1dde324 100644
--- a/src/components/conversations/search-command-dialog.tsx
+++ b/src/components/conversations/search-command-dialog.tsx
@@ -175,11 +175,25 @@ export function SearchCommandDialog({
 
   return (
     <CommandDialog
-      title={t("dialogTitle")}
+      title={
+        folder
+          ? t("dialogTitleWithFolder", { name: folder.name })
+          : t("dialogTitle")
+      }
       open={open}
       onOpenChange={onOpenChange}
       shouldFilter={activeTab === "conversations"}
     >
+      {/* Folder context header */}
+      {folder && (
+        <div className="flex items-center gap-2 border-b px-4 py-2.5">
+          <Folder className="w-4 h-4 shrink-0 text-muted-foreground" />
+          <span className="text-sm font-medium truncate">
+            {t("dialogTitleWithFolder", { name: folder.name })}
+          </span>
+        </div>
+      )}
+
       {/* Tabs */}
       <div className="flex items-center gap-0 border-b px-3">
         <button
diff --git a/src/i18n/messages/ar.json b/src/i18n/messages/ar.json
index 9c0017c..24bf7bf 100644
--- a/src/i18n/messages/ar.json
+++ b/src/i18n/messages/ar.json
@@ -881,6 +881,7 @@
     },
     "search": {
       "dialogTitle": "بحث",
+      "dialogTitleWithFolder": "بحث — {name}",
       "tabConversations": "المحادثات",
       "tabFiles": "الملفات",
       "placeholder": "البحث في المحادثات...",
diff --git a/src/i18n/messages/de.json b/src/i18n/messages/de.json
index 636302d..d21af18 100644
--- a/src/i18n/messages/de.json
+++ b/src/i18n/messages/de.json
@@ -881,6 +881,7 @@
     },
     "search": {
       "dialogTitle": "Suchen",
+      "dialogTitleWithFolder": "Suchen — {name}",
       "tabConversations": "Konversationen",
       "tabFiles": "Dateien",
       "placeholder": "Konversationen suchen...",
diff --git a/src/i18n/messages/en.json b/src/i18n/messages/en.json
index 6929fd3..2c8d1a8 100644
--- a/src/i18n/messages/en.json
+++ b/src/i18n/messages/en.json
@@ -881,6 +881,7 @@
     },
     "search": {
       "dialogTitle": "Search",
+      "dialogTitleWithFolder": "Search — {name}",
       "tabConversations": "Conversations",
       "tabFiles": "Files",
       "placeholder": "Search conversations...",
diff --git a/src/i18n/messages/es.json b/src/i18n/messages/es.json
index 71add80..1e6b019 100644
--- a/src/i18n/messages/es.json
+++ b/src/i18n/messages/es.json
@@ -881,6 +881,7 @@
     },
     "search": {
       "dialogTitle": "Buscar",
+      "dialogTitleWithFolder": "Buscar — {name}",
       "tabConversations": "Conversaciones",
       "tabFiles": "Archivos",
       "placeholder": "Buscar conversaciones...",
diff --git a/src/i18n/messages/fr.json b/src/i18n/messages/fr.json
index 6242cc1..6fd8e82 100644
--- a/src/i18n/messages/fr.json
+++ b/src/i18n/messages/fr.json
@@ -881,6 +881,7 @@
     },
     "search": {
       "dialogTitle": "Rechercher",
+      "dialogTitleWithFolder": "Rechercher — {name}",
       "tabConversations": "Conversations",
       "tabFiles": "Fichiers",
       "placeholder": "Rechercher des conversations...",
diff --git a/src/i18n/messages/ja.json b/src/i18n/messages/ja.json
index 1f287a1..dd17331 100644
--- a/src/i18n/messages/ja.json
+++ b/src/i18n/messages/ja.json
@@ -881,6 +881,7 @@
     },
     "search": {
       "dialogTitle": "検索",
+      "dialogTitleWithFolder": "検索 — {name}",
       "tabConversations": "会話",
       "tabFiles": "ファイル",
       "placeholder": "会話を検索...",
diff --git a/src/i18n/messages/ko.json b/src/i18n/messages/ko.json
index 61a9902..177bdf4 100644
--- a/src/i18n/messages/ko.json
+++ b/src/i18n/messages/ko.json
@@ -881,6 +881,7 @@
     },
     "search": {
       "dialogTitle": "검색",
+      "dialogTitleWithFolder": "검색 — {name}",
       "tabConversations": "대화",
       "tabFiles": "파일",
       "placeholder": "대화 검색...",
diff --git a/src/i18n/messages/pt.json b/src/i18n/messages/pt.json
index d58db4a..45addc2 100644
--- a/src/i18n/messages/pt.json
+++ b/src/i18n/messages/pt.json
@@ -881,6 +881,7 @@
     },
     "search": {
       "dialogTitle": "Buscar",
+      "dialogTitleWithFolder": "Buscar — {name}",
       "tabConversations": "Conversas",
       "tabFiles": "Arquivos",
       "placeholder": "Buscar conversas...",
diff --git a/src/i18n/messages/zh-CN.json b/src/i18n/messages/zh-CN.json
index 3f34fac..7ee1c4c 100644
--- a/src/i18n/messages/zh-CN.json
+++ b/src/i18n/messages/zh-CN.json
@@ -881,6 +881,7 @@
     },
     "search": {
       "dialogTitle": "搜索",
+      "dialogTitleWithFolder": "搜索 — {name}",
       "tabConversations": "会话",
       "tabFiles": "文件",
       "placeholder": "搜索会话...",
diff --git a/src/i18n/messages/zh-TW.json b/src/i18n/messages/zh-TW.json
index a7cec71..8baf44e 100644
--- a/src/i18n/messages/zh-TW.json
+++ b/src/i18n/messages/zh-TW.json
@@ -881,6 +881,7 @@
     },
     "search": {
       "dialogTitle": "搜尋",
+      "dialogTitleWithFolder": "搜尋 — {name}",
       "tabConversations": "會話",
       "tabFiles": "檔案",
       "placeholder": "搜尋會話...",