diff --git a/frontend/src/components/DiffCard.tsx b/frontend/src/components/DiffCard.tsx
index e74e0464..31779f46 100644
--- a/frontend/src/components/DiffCard.tsx
+++ b/frontend/src/components/DiffCard.tsx
@@ -26,6 +26,7 @@ import { useReview, type ReviewDraft } from '@/contexts/ReviewProvider';
 import { CommentWidgetLine } from '@/components/diff/CommentWidgetLine';
 import { ReviewCommentRenderer } from '@/components/diff/ReviewCommentRenderer';
 import { useDiffViewMode } from '@/stores/useDiffViewStore';
+import { useProject } from '@/contexts/project-context';
 
 type Props = {
   diff: Diff;
@@ -75,6 +76,7 @@ export default function DiffCard({
   const theme = getActualTheme(config?.theme);
   const { comments, drafts, setDraft } = useReview();
   const globalMode = useDiffViewMode();
+  const { projectId } = useProject();
 
   const oldName = diff.oldPath || undefined;
   const newName = diff.newPath || oldName || 'unknown';
@@ -173,12 +175,15 @@ export default function DiffCard({
         widgetKey={widgetKey}
         onSave={props.onClose}
         onCancel={props.onClose}
+        projectId={projectId}
       />
     );
   };
 
   const renderExtendLine = (lineData: any) => {
-    return <ReviewCommentRenderer comment={lineData.data} />;
+    return (
+      <ReviewCommentRenderer comment={lineData.data} projectId={projectId} />
+    );
   };
 
   // Title row
diff --git a/frontend/src/components/diff/CommentWidgetLine.tsx b/frontend/src/components/diff/CommentWidgetLine.tsx
index 20429d48..f09679ec 100644
--- a/frontend/src/components/diff/CommentWidgetLine.tsx
+++ b/frontend/src/components/diff/CommentWidgetLine.tsx
@@ -1,5 +1,6 @@
 import React, { useState, useRef, useEffect } from 'react';
 import { Button } from '@/components/ui/button';
+import { FileSearchTextarea } from '@/components/ui/file-search-textarea';
 import { useReview, type ReviewDraft } from '@/contexts/ReviewProvider';
 
 interface CommentWidgetLineProps {
@@ -7,6 +8,7 @@ interface CommentWidgetLineProps {
   widgetKey: string;
   onSave: () => void;
   onCancel: () => void;
+  projectId?: string;
 }
 
 export function CommentWidgetLine({
@@ -14,6 +16,7 @@ export function CommentWidgetLine({
   widgetKey,
   onSave,
   onCancel,
+  projectId,
 }: CommentWidgetLineProps) {
   const { setDraft, addComment } = useReview();
   const [value, setValue] = useState(draft.text);
@@ -52,14 +55,15 @@ export function CommentWidgetLine({
 
   return (
     <div className="p-4 border-y">
-      <textarea
-        ref={textareaRef}
+      <FileSearchTextarea
         value={value}
-        onChange={(e) => setValue(e.target.value)}
+        onChange={setValue}
         onKeyDown={handleKeyDown}
-        placeholder="Add a comment..."
-        className="w-full bg-primary text-primary-foreground text-sm font-mono resize-none min-h-[60px] focus:outline-none focus:ring-1 focus:ring-primary"
+        placeholder="Add a comment... (type @ to search files)"
         rows={3}
+        maxRows={10}
+        className="w-full bg-primary text-primary-foreground text-sm font-mono resize-none min-h-[60px] focus:outline-none focus:ring-1 focus:ring-primary"
+        projectId={projectId}
       />
       <div className="mt-2 flex gap-2">
         <Button size="xs" onClick={handleSave} disabled={!value.trim()}>
diff --git a/frontend/src/components/diff/ReviewCommentRenderer.tsx b/frontend/src/components/diff/ReviewCommentRenderer.tsx
index 55ad1087..8ffc71a8 100644
--- a/frontend/src/components/diff/ReviewCommentRenderer.tsx
+++ b/frontend/src/components/diff/ReviewCommentRenderer.tsx
@@ -1,13 +1,18 @@
 import React, { useState, useRef, useEffect } from 'react';
 import { Trash2, Pencil } from 'lucide-react';
 import { Button } from '@/components/ui/button';
+import { FileSearchTextarea } from '@/components/ui/file-search-textarea';
 import { useReview, type ReviewComment } from '@/contexts/ReviewProvider';
 
 interface ReviewCommentRendererProps {
   comment: ReviewComment;
+  projectId?: string;
 }
 
-export function ReviewCommentRenderer({ comment }: ReviewCommentRendererProps) {
+export function ReviewCommentRenderer({
+  comment,
+  projectId,
+}: ReviewCommentRendererProps) {
   const { deleteComment, updateComment } = useReview();
   const [isEditing, setIsEditing] = useState(false);
   const [editText, setEditText] = useState(comment.text);
@@ -51,14 +56,15 @@ export function ReviewCommentRenderer({ comment }: ReviewCommentRendererProps) {
   if (isEditing) {
     return (
       <div className="border-y bg-background p-4">
-        <textarea
-          ref={textareaRef}
+        <FileSearchTextarea
           value={editText}
-          onChange={(e) => setEditText(e.target.value)}
+          onChange={setEditText}
           onKeyDown={handleKeyDown}
-          placeholder="Edit comment..."
-          className="w-full bg-background text-foreground text-sm font-mono resize-none min-h-[60px] focus:outline-none"
+          placeholder="Edit comment... (type @ to search files)"
           rows={3}
+          maxRows={10}
+          className="w-full bg-background text-foreground text-sm font-mono resize-none min-h-[60px] focus:outline-none"
+          projectId={projectId}
         />
         <div className="mt-2 flex gap-2">
           <Button size="xs" onClick={handleSave} disabled={!editText.trim()}>
diff --git a/frontend/src/contexts/ReviewProvider.tsx b/frontend/src/contexts/ReviewProvider.tsx
index f2464aa9..3d0869ef 100644
--- a/frontend/src/contexts/ReviewProvider.tsx
+++ b/frontend/src/contexts/ReviewProvider.tsx
@@ -96,11 +96,14 @@ export function ReviewProvider({ children }: { children: ReactNode }) {
     const commentsMd = comments
       .map((comment) => {
         const codeLine = formatCodeLine(comment.codeLine);
-        const commentBody = comment.text.trim();
+        // Format file paths in comment body with backticks
+        const bodyWithFormattedPaths = comment.text
+          .trim()
+          .replace(/([/\\]?[\w.-]+(?:[/\\][\w.-]+)+)/g, '`$1`');
         if (codeLine) {
-          return `**${comment.filePath}** (Line ${comment.lineNumber})\n${codeLine}\n\n> ${commentBody}\n`;
+          return `**${comment.filePath}** (Line ${comment.lineNumber})\n${codeLine}\n\n> ${bodyWithFormattedPaths}\n`;
         }
-        return `**${comment.filePath}** (Line ${comment.lineNumber})\n\n> ${commentBody}\n`;
+        return `**${comment.filePath}** (Line ${comment.lineNumber})\n\n> ${bodyWithFormattedPaths}\n`;
       })
       .join('\n');