diff --git a/apps/web/features/search/components/search-command.tsx b/apps/web/features/search/components/search-command.tsx
index c55647e7a..6c3218332 100644
--- a/apps/web/features/search/components/search-command.tsx
+++ b/apps/web/features/search/components/search-command.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useCallback, useEffect, useRef, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useRouter } from "next/navigation";
 import { Loader2, MessageSquare, SearchIcon } from "lucide-react";
 import { Command as CommandPrimitive } from "cmdk";
@@ -17,6 +17,42 @@ import {
 } from "@multica/ui/components/ui/dialog";
 import { useSearchStore } from "../stores/search-store";
 
+function HighlightText({ text, query }: { text: string; query: string }) {
+  const parts = useMemo(() => {
+    if (!query.trim()) return [{ text, highlight: false }];
+    const escaped = query.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    const regex = new RegExp(`(${escaped})`, "gi");
+    const result: { text: string; highlight: boolean }[] = [];
+    let lastIndex = 0;
+    let match: RegExpExecArray | null;
+    while ((match = regex.exec(text)) !== null) {
+      if (match.index > lastIndex) {
+        result.push({ text: text.slice(lastIndex, match.index), highlight: false });
+      }
+      result.push({ text: match[0], highlight: true });
+      lastIndex = regex.lastIndex;
+    }
+    if (lastIndex < text.length) {
+      result.push({ text: text.slice(lastIndex), highlight: false });
+    }
+    return result.length > 0 ? result : [{ text, highlight: false }];
+  }, [text, query]);
+
+  return (
+    <>
+      {parts.map((part, i) =>
+        part.highlight ? (
+          <mark key={i} className="bg-yellow-200 dark:bg-yellow-900/60 text-inherit rounded-sm">
+            {part.text}
+          </mark>
+        ) : (
+          part.text
+        ),
+      )}
+    </>
+  );
+}
+
 export function SearchCommand() {
   const router = useRouter();
   const open = useSearchStore((s) => s.open);
@@ -166,7 +202,9 @@ export function SearchCommand() {
                       <span className="text-xs text-muted-foreground shrink-0">
                         {issue.identifier}
                       </span>
-                      <span className="truncate">{issue.title}</span>
+                      <span className="truncate">
+                        <HighlightText text={issue.title} query={query} />
+                      </span>
                       <span
                         className={`ml-auto text-xs shrink-0 ${STATUS_CONFIG[issue.status].iconColor}`}
                       >
@@ -178,7 +216,10 @@ export function SearchCommand() {
                         <div className="flex items-start gap-2 pl-[26px]">
                           <MessageSquare className="size-3 shrink-0 text-muted-foreground mt-0.5" />
                           <span className="text-xs text-muted-foreground truncate">
-                            {issue.matched_snippet}
+                            <HighlightText
+                              text={issue.matched_snippet}
+                              query={query}
+                            />
                           </span>
                         </div>
                       )}