diff --git a/crates/server/src/routes/task_attempts.rs b/crates/server/src/routes/task_attempts.rs
index 86673f60..c6ddfd8a 100644
--- a/crates/server/src/routes/task_attempts.rs
+++ b/crates/server/src/routes/task_attempts.rs
@@ -592,6 +592,7 @@ pub async fn create_github_pr(
 #[derive(serde::Deserialize)]
 pub struct OpenEditorRequest {
     editor_type: Option<String>,
+    file_path: Option<String>,
 }
 
 pub async fn open_task_attempt_in_editor(
@@ -601,7 +602,7 @@ pub async fn open_task_attempt_in_editor(
 ) -> Result<ResponseJson<ApiResponse<()>>, ApiError> {
     // Get the task attempt to access the worktree path
     let attempt = &task_attempt;
-    let path = attempt.container_ref.as_ref().ok_or_else(|| {
+    let base_path = attempt.container_ref.as_ref().ok_or_else(|| {
         tracing::error!(
             "No container ref found for task attempt {}",
             task_attempt.id
@@ -611,18 +612,25 @@ pub async fn open_task_attempt_in_editor(
         ))
     })?;
 
+    // If a specific file path is provided, use it; otherwise use the base path
+    let path = if let Some(file_path) = payload.as_ref().and_then(|req| req.file_path.as_ref()) {
+        std::path::Path::new(base_path).join(file_path)
+    } else {
+        std::path::PathBuf::from(base_path)
+    };
+
     let editor_config = {
         let config = deployment.config().read().await;
         let editor_type_str = payload.as_ref().and_then(|req| req.editor_type.as_deref());
         config.editor.with_override(editor_type_str)
     };
 
-    match editor_config.open_file(path) {
+    match editor_config.open_file(&path.to_string_lossy()) {
         Ok(_) => {
             tracing::info!(
                 "Opened editor for task attempt {} at path: {}",
                 task_attempt.id,
-                path
+                path.display()
             );
             Ok(ResponseJson(ApiResponse::success(())))
         }
diff --git a/frontend/src/components/DiffCard.tsx b/frontend/src/components/DiffCard.tsx
index e91d3737..d5d44161 100644
--- a/frontend/src/components/DiffCard.tsx
+++ b/frontend/src/components/DiffCard.tsx
@@ -2,6 +2,11 @@ import { DiffFile, DiffModeEnum, DiffView } from '@git-diff-view/react';
 import { ThemeMode } from 'shared/types';
 import '../styles/diff-style-overrides.css';
 import { useConfig } from './config-provider';
+import { useContext } from 'react';
+import { TaskSelectedAttemptContext } from './context/taskDetailsContext';
+import { Button } from './ui/button';
+import { FolderOpen } from 'lucide-react';
+import { attemptsApi } from '@/lib/api';
 
 type Props = {
   diffFile: DiffFile;
@@ -10,26 +15,51 @@ type Props = {
 
 const DiffCard = ({ diffFile, key }: Props) => {
   const { config } = useConfig();
+  const { selectedAttempt } = useContext(TaskSelectedAttemptContext);
 
   let theme: 'light' | 'dark' | undefined = 'light';
   if (config?.theme === ThemeMode.DARK) {
     theme = 'dark';
   }
 
+  const handleOpenInIDE = async () => {
+    if (!selectedAttempt?.id) return;
+    try {
+      await attemptsApi.openEditor(
+        selectedAttempt.id,
+        undefined,
+        diffFile._newFileName
+      );
+    } catch (error) {
+      console.error('Failed to open file in IDE:', error);
+    }
+  };
+
   return (
     <div className="my-4 border" key={key}>
-      <p
-        className="text-xs font-mono px-4 py-2 overflow-x-auto"
-        style={{ color: 'hsl(var(--muted-foreground) / 0.7)' }}
-      >
-        {diffFile._newFileName}{' '}
-        <span style={{ color: 'hsl(var(--console-success))' }}>
-          +{diffFile.additionLength}
-        </span>{' '}
-        <span style={{ color: 'hsl(var(--console-error))' }}>
-          -{diffFile.deletionLength}
-        </span>
-      </p>
+      <div className="flex items-center justify-between px-4 py-2">
+        <p
+          className="text-xs font-mono overflow-x-auto flex-1"
+          style={{ color: 'hsl(var(--muted-foreground) / 0.7)' }}
+        >
+          {diffFile._newFileName}{' '}
+          <span style={{ color: 'hsl(var(--console-success))' }}>
+            +{diffFile.additionLength}
+          </span>{' '}
+          <span style={{ color: 'hsl(var(--console-error))' }}>
+            -{diffFile.deletionLength}
+          </span>
+        </p>
+        <Button
+          variant="ghost"
+          size="sm"
+          onClick={handleOpenInIDE}
+          className="h-6 w-6 p-0 ml-2"
+          title="Open in IDE"
+        >
+          <FolderOpen className="h-3 w-3" />
+        </Button>
+      </div>
       <DiffView
         diffFile={diffFile}
         diffViewWrap={false}
diff --git a/frontend/src/lib/api.ts b/frontend/src/lib/api.ts
index cb8358a0..c57a8efc 100644
--- a/frontend/src/lib/api.ts
+++ b/frontend/src/lib/api.ts
@@ -336,13 +336,20 @@ export const attemptsApi = {
 
   openEditor: async (
     attemptId: string,
-    editorType?: EditorType
+    editorType?: EditorType,
+    filePath?: string
   ): Promise<void> => {
+    const requestBody: any = {};
+    if (editorType) requestBody.editor_type = editorType;
+    if (filePath) requestBody.file_path = filePath;
+
     const response = await makeRequest(
       `/api/task-attempts/${attemptId}/open-editor`,
       {
         method: 'POST',
-        body: JSON.stringify(editorType ? { editor_type: editorType } : null),
+        body: JSON.stringify(
+          Object.keys(requestBody).length > 0 ? requestBody : null
+        ),
       }
     );
     return handleApiResponse<void>(response);