diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsx
index 815bedf2ac985..b6ae5e18ef80d 100644
--- a/apps/web/src/components/ChatView.tsx
+++ b/apps/web/src/components/ChatView.tsx
@@ -3380,6 +3380,8 @@ export default function ChatView(props: ChatViewProps) {
               {...(isServerThread && isGitRepo
                 ? { onOpenChanges: openChangesFromThreadPanelStable }
                 : {})}
+              // Coder: changed files in the Git actions dialog open in the Files surface.
+              {...(isServerThread ? { onOpenFile: openFileSurfaceStable } : {})}
               onRunProjectScript={runProjectScriptStable}
               onAddProjectScript={saveProjectScriptStable}
               onUpdateProjectScript={updateProjectScriptStable}
diff --git a/apps/web/src/components/GitActionsControl.tsx b/apps/web/src/components/GitActionsControl.tsx
index 1b0bd38dbdaf7..05f55a0e2f46d 100644
--- a/apps/web/src/components/GitActionsControl.tsx
+++ b/apps/web/src/components/GitActionsControl.tsx
@@ -1721,7 +1721,13 @@ export default function GitActionsControl({
                                 <button
                                   type="button"
                                   className="flex min-w-0 flex-1 items-center justify-between gap-3 text-left enabled:cursor-pointer"
-                                  onClick={() => onOpenFile?.(changedFileOpenPath(file.path))}
+                                  aria-label={`Open ${file.path} in Files`}
+                                  onClick={() => {
+                                    onOpenFile?.(changedFileOpenPath(file.path));
+                                    // Coder: the file opens in the right panel behind this dialog,
+                                    // so the dialog closes; its message stays for the next open.
+                                    setIsCommitDialogOpen(false);
+                                  }}
                                   disabled={!onOpenFile}
                                 >
                                   <StartTruncatedPath
diff --git a/apps/web/src/components/chat/ThreadDetailsPanel.tsx b/apps/web/src/components/chat/ThreadDetailsPanel.tsx
index 8da8de62914d1..59ab660b710a6 100644
--- a/apps/web/src/components/chat/ThreadDetailsPanel.tsx
+++ b/apps/web/src/components/chat/ThreadDetailsPanel.tsx
@@ -57,6 +57,8 @@ interface ThreadDetailsPanelProps extends Pick<
   onCheckoutPullRequestRequest?: (reference: string) => void;
   onComposerFocusRequest: () => void;
   onOpenChanges?: () => void;
+  /** Coder: opens a changed file from the Git actions dialog in the Files surface. */
+  onOpenFile?: (relativePath: string) => void;
   onRunProjectScript: (script: ProjectScript) => void;
   onAddProjectScript: (input: NewProjectScriptInput) => Promise<ProjectScriptActionResult>;
   onUpdateProjectScript: (
@@ -161,6 +163,7 @@ export function ThreadDetailsPanel(props: ThreadDetailsPanelProps) {
                     activeThreadRef={activeThreadRef}
                     {...(props.draftId ? { draftId: props.draftId } : {})}
                     {...(props.onOpenChanges ? { onOpenChanges: props.onOpenChanges } : {})}
+                    {...(props.onOpenFile ? { onOpenFile: props.onOpenFile } : {})}
                   />
                 ) : null}
               </div>
diff --git a/docs/internals/coder-only.md b/docs/internals/coder-only.md
index a38b41b0caae8..fa66ed21f77e1 100644
--- a/docs/internals/coder-only.md
+++ b/docs/internals/coder-only.md
@@ -1051,7 +1051,9 @@ listed here is drift to remove rather than fork behavior to keep.
   `resolveFileContextMenuAbsolutePath` but replaces its editor and reveal items with Open in Files
   (when the caller passes a thread) and Copy path, which copies that full path; the Files tree,
   the diff panel, and turn change cards use it. Changed files in the Git actions dialog open in the
-  Files surface instead of an editor: repository-relative status paths map to the thread's folder,
+  Files surface instead of an editor (`ChatView` passes `openFileSurfaceStable` through
+  `ThreadDetailsPanel`'s `onOpenFile`), and the dialog closes so the file is visible, keeping its
+  commit message for the next open: repository-relative status paths map to the thread's folder,
   and a file outside a subfolder project opens by its absolute path.
   `projectFilesQueryState.ts` has no `isFile`, which only the uncarried `OpenInPicker` reads.
   `env.ts` reports `isElectron = false` for upstream's desktop branches.