diff --git a/apps/desktop/src/App.vue b/apps/desktop/src/App.vue
index f3e2e11f73..572d2db0ee 100644
--- a/apps/desktop/src/App.vue
+++ b/apps/desktop/src/App.vue
@@ -537,7 +537,6 @@ function handleKeydown(e: KeyboardEvent) {
   const shortcuts = settingsStore.editorSettings.shortcuts;
 
   if (isFocusSearchShortcut(e, shortcuts)) {
-    if (activeTab.value?.mode === "query") return;
     const focused = contentAreaRef.value?.focusSearch() || appSidebarRef.value?.focusSearch();
     if (focused) {
       e.preventDefault();
diff --git a/apps/desktop/src/components/editor/QueryEditor.vue b/apps/desktop/src/components/editor/QueryEditor.vue
index cf0c6e0084..a79c15680d 100644
--- a/apps/desktop/src/components/editor/QueryEditor.vue
+++ b/apps/desktop/src/components/editor/QueryEditor.vue
@@ -1,7 +1,17 @@
 <script setup lang="ts">
-import { ref, onMounted, onBeforeUnmount, watch, shallowRef } from "vue";
+import { ref, nextTick, onMounted, onBeforeUnmount, watch, shallowRef } from "vue";
 import type { CompletionContext } from "@codemirror/autocomplete";
 import type { EditorView as EditorViewType } from "@codemirror/view";
+import {
+  SearchQuery,
+  setSearchQuery,
+  findNext as cmFindNext,
+  findPrevious as cmFindPrevious,
+  replaceNext as cmReplaceNext,
+  replaceAll as cmReplaceAll,
+  search as cmSearch,
+} from "@codemirror/search";
+import { ChevronUp, ChevronDown, ChevronRight, X } from "lucide-vue-next";
 import { resolveExecutableSql } from "@/lib/sqlExecutionTarget";
 import { formatSqlText, type SqlFormatDialect } from "@/lib/sqlFormatter";
 import { useConnectionStore } from "@/stores/connectionStore";
@@ -49,6 +59,17 @@ const settingsStore = useSettingsStore();
 const MIN_FONT_SIZE = 10;
 const MAX_FONT_SIZE = 24;
 const MAX_COMPLETION_TABLES = 200;
+
+const searchVisible = ref(false);
+const searchText = ref("");
+const replaceText = ref("");
+const showReplace = ref(false);
+const caseSensitive = ref(false);
+const useRegex = ref(false);
+const matchCount = ref(0);
+const currentMatchIndex = ref(0);
+const searchInputRef = ref<HTMLInputElement>();
+
 let editorViewModule: typeof import("@codemirror/view") | null = null;
 let fontThemeComp: import("@codemirror/state").Compartment | null = null;
 let codeMirrorTheme: import("@codemirror/state").Compartment | null = null;
@@ -587,6 +608,14 @@ onMounted(async () => {
   const state = EditorState.create({
     doc: props.modelValue,
     extensions: [
+      cmSearch({
+        top: true,
+        createPanel: () => {
+          const dom = document.createElement("span");
+          dom.style.display = "none";
+          return { dom };
+        },
+      }),
       basicSetup,
       sql({ dialect }),
       autocompletion({
@@ -621,6 +650,7 @@ onMounted(async () => {
         if (update.selectionSet || update.docChanged) {
           emit("selectionChange", selectedSqlFromView(update.view));
           emit("cursorChange", update.state.selection.main.head);
+          if (searchVisible.value) updateMatchInfo();
         }
       }),
       fontThemeComp.of(
@@ -856,8 +886,230 @@ watch(
 onBeforeUnmount(() => {
   view.value?.destroy();
 });
+
+function dispatchSearchQuery() {
+  const v = view.value;
+  if (!v) return;
+  const q = new SearchQuery({
+    search: searchText.value,
+    caseSensitive: caseSensitive.value,
+    regexp: useRegex.value,
+    replace: replaceText.value,
+  });
+  v.dispatch({ effects: setSearchQuery.of(q) });
+  updateMatchInfo();
+}
+
+function updateMatchInfo() {
+  const v = view.value;
+  if (!v || !searchText.value) {
+    matchCount.value = 0;
+    currentMatchIndex.value = 0;
+    return;
+  }
+  try {
+    const q = new SearchQuery({
+      search: searchText.value,
+      caseSensitive: caseSensitive.value,
+      regexp: useRegex.value,
+    });
+    if (!q.valid) {
+      matchCount.value = 0;
+      currentMatchIndex.value = 0;
+      return;
+    }
+    const iter = q.getCursor(v.state);
+    let count = 0;
+    let curIdx = 0;
+    const selFrom = v.state.selection.main.from;
+    const selTo = v.state.selection.main.to;
+    let r = iter.next();
+    while (!r.done) {
+      count++;
+      if (r.value.from === selFrom && r.value.to === selTo) curIdx = count;
+      r = iter.next();
+    }
+    matchCount.value = count;
+    currentMatchIndex.value = curIdx || (count > 0 ? 1 : 0);
+  } catch {
+    matchCount.value = 0;
+    currentMatchIndex.value = 0;
+  }
+}
+
+function openSearch(): boolean {
+  searchVisible.value = true;
+  const v = view.value;
+  if (v) {
+    const sel = v.state.sliceDoc(v.state.selection.main.from, v.state.selection.main.to);
+    if (sel && !sel.includes("\n")) searchText.value = sel;
+  }
+  nextTick(() => {
+    searchInputRef.value?.focus();
+    searchInputRef.value?.select();
+  });
+  if (searchText.value) dispatchSearchQuery();
+  return true;
+}
+
+function closeSearch() {
+  searchVisible.value = false;
+  showReplace.value = false;
+  const v = view.value;
+  if (v) {
+    v.dispatch({ effects: setSearchQuery.of(new SearchQuery({ search: "" })) });
+    v.focus();
+  }
+  matchCount.value = 0;
+  currentMatchIndex.value = 0;
+}
+
+function nextMatch() {
+  const v = view.value;
+  if (!v || !searchText.value) return;
+  cmFindNext(v);
+  updateMatchInfo();
+}
+
+function prevMatch() {
+  const v = view.value;
+  if (!v || !searchText.value) return;
+  cmFindPrevious(v);
+  updateMatchInfo();
+}
+
+function doReplace() {
+  const v = view.value;
+  if (!v || !searchText.value) return;
+  cmReplaceNext(v);
+  updateMatchInfo();
+}
+
+function doReplaceAll() {
+  const v = view.value;
+  if (!v || !searchText.value) return;
+  cmReplaceAll(v);
+  updateMatchInfo();
+}
+
+function onSearchKeydown(e: KeyboardEvent) {
+  if (e.key === "Escape") {
+    e.preventDefault();
+    closeSearch();
+  } else if (e.key === "Enter" && !e.shiftKey) {
+    e.preventDefault();
+    nextMatch();
+  } else if (e.key === "Enter" && e.shiftKey) {
+    e.preventDefault();
+    prevMatch();
+  }
+}
+
+watch([searchText, caseSensitive, useRegex, replaceText], () => {
+  if (searchVisible.value) dispatchSearchQuery();
+});
+
+defineExpose({ openSearch });
 </script>
 
 <template>
-  <div ref="editorRef" data-query-editor-root class="h-full w-full overflow-hidden" />
+  <div class="h-full w-full overflow-hidden relative">
+    <div ref="editorRef" data-query-editor-root class="h-full w-full overflow-hidden" />
+    <Transition
+      enter-active-class="transition-all duration-150"
+      leave-active-class="transition-all duration-100"
+      enter-from-class="opacity-0 -translate-y-1"
+      leave-to-class="opacity-0 -translate-y-1"
+    >
+      <div
+        v-if="searchVisible"
+        class="absolute top-1 right-4 z-20 bg-background border rounded-md shadow-md p-1.5 flex flex-col gap-1"
+      >
+        <div class="flex items-center gap-0.5">
+          <input
+            ref="searchInputRef"
+            v-model="searchText"
+            autocapitalize="off"
+            autocorrect="off"
+            spellcheck="false"
+            class="w-48 h-6 text-xs bg-input border rounded px-2 outline-none focus:ring-1 focus:ring-ring placeholder:text-muted-foreground"
+            placeholder="查找"
+            @keydown="onSearchKeydown"
+          />
+          <button
+            class="w-6 h-6 flex items-center justify-center rounded text-xs font-mono hover:bg-accent"
+            :class="caseSensitive ? 'bg-accent text-accent-foreground' : 'text-muted-foreground'"
+            title="区分大小写"
+            @click="caseSensitive = !caseSensitive"
+          >
+            Aa
+          </button>
+          <button
+            class="w-6 h-6 flex items-center justify-center rounded text-xs font-mono hover:bg-accent"
+            :class="useRegex ? 'bg-accent text-accent-foreground' : 'text-muted-foreground'"
+            title="正则表达式"
+            @click="useRegex = !useRegex"
+          >
+            .*
+          </button>
+          <span v-if="searchText" class="text-xs text-muted-foreground min-w-[3rem] text-center shrink-0">
+            {{ matchCount > 0 ? `${currentMatchIndex}/${matchCount}` : "无结果" }}
+          </span>
+          <button
+            class="w-5 h-5 flex items-center justify-center rounded text-muted-foreground hover:bg-accent hover:text-foreground"
+            title="上一个 (Shift+Enter)"
+            @click="prevMatch"
+          >
+            <ChevronUp class="w-3.5 h-3.5" />
+          </button>
+          <button
+            class="w-5 h-5 flex items-center justify-center rounded text-muted-foreground hover:bg-accent hover:text-foreground"
+            title="下一个 (Enter)"
+            @click="nextMatch"
+          >
+            <ChevronDown class="w-3.5 h-3.5" />
+          </button>
+          <button
+            class="w-5 h-5 flex items-center justify-center rounded text-muted-foreground hover:bg-accent hover:text-foreground"
+            :title="showReplace ? '收起替换' : '展开替换'"
+            @click="showReplace = !showReplace"
+          >
+            <ChevronRight class="w-3 h-3 transition-transform" :class="showReplace && 'rotate-90'" />
+          </button>
+          <button
+            class="w-5 h-5 flex items-center justify-center rounded text-muted-foreground hover:bg-accent hover:text-foreground"
+            title="关闭 (Esc)"
+            @click="closeSearch"
+          >
+            <X class="w-3.5 h-3.5" />
+          </button>
+        </div>
+        <div v-if="showReplace" class="flex items-center gap-0.5">
+          <input
+            v-model="replaceText"
+            autocapitalize="off"
+            autocorrect="off"
+            spellcheck="false"
+            class="w-48 h-6 text-xs bg-input border rounded px-2 outline-none focus:ring-1 focus:ring-ring placeholder:text-muted-foreground"
+            placeholder="替换"
+            @keydown.enter.prevent="doReplace"
+          />
+          <button
+            class="h-6 px-1.5 flex items-center justify-center rounded text-xs text-muted-foreground hover:bg-accent hover:text-foreground border"
+            title="替换"
+            @click="doReplace"
+          >
+            替换
+          </button>
+          <button
+            class="h-6 px-1.5 flex items-center justify-center rounded text-xs text-muted-foreground hover:bg-accent hover:text-foreground border"
+            title="全部替换"
+            @click="doReplaceAll"
+          >
+            全部
+          </button>
+        </div>
+      </div>
+    </Transition>
+  </div>
 </template>
diff --git a/apps/desktop/src/components/layout/ContentArea.vue b/apps/desktop/src/components/layout/ContentArea.vue
index 5f00664b80..b480106bfd 100644
--- a/apps/desktop/src/components/layout/ContentArea.vue
+++ b/apps/desktop/src/components/layout/ContentArea.vue
@@ -91,6 +91,7 @@ const columnInfoColumns = ref<ColumnInfo[]>([]);
 const columnInfoLoading = ref(false);
 const columnInfoError = ref<string | undefined>(undefined);
 const dataGridRef = ref<DataGridHandle>();
+const queryEditorRef = ref<InstanceType<typeof QueryEditor>>();
 const columnVisibilitySearch = ref("");
 const columnVisibilityOptions = computed(
   () => dataGridRef.value?.filteredColumnVisibilityOptions(columnVisibilitySearch.value) ?? [],
@@ -209,7 +210,7 @@ function onHandleCloseColumnPanel() {
 function focusSearch(): boolean {
   if (props.activeTab.mode === "redis") return redisKeyBrowserRef.value?.focusSearch() ?? false;
   if (props.activeTab.mode === "objects") return objectBrowserRef.value?.focusSearch() ?? false;
-  if (props.activeTab.mode === "query" && props.activeOutputView !== "result") return false;
+  if (props.activeTab.mode === "query") return queryEditorRef.value?.openSearch() ?? false;
   return dataGridRef.value?.focusSearch() ?? false;
 }
 
@@ -230,6 +231,7 @@ defineExpose({ focusSearch, refreshData });
         <Pane :size="40" :min-size="15">
           <div class="h-full flex flex-col relative">
             <QueryEditor
+              ref="queryEditorRef"
               class="flex-1"
               :model-value="activeTab.sql"
               :connection-id="activeTab.connectionId"
diff --git a/package.json b/package.json
index 534ce071a3..50cf598354 100644
--- a/package.json
+++ b/package.json
@@ -31,6 +31,7 @@
     "@codemirror/commands": "^6.10.3",
     "@codemirror/lang-sql": "^6.10.0",
     "@codemirror/language": "^6.12.3",
+    "@codemirror/search": "^6.7.0",
     "@codemirror/state": "^6.6.0",
     "@codemirror/theme-one-dark": "^6.1.3",
     "@codemirror/view": "^6.41.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index be0567a881..d1569d9455 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -23,6 +23,9 @@ importers:
       '@codemirror/language':
         specifier: ^6.12.3
         version: 6.12.3
+      '@codemirror/search':
+        specifier: ^6.7.0
+        version: 6.7.0
       '@codemirror/state':
         specifier: ^6.6.0
         version: 6.6.0