diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/DiffPane/DiffPane.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/DiffPane/DiffPane.tsx
index c6a02f042e0..d84cfc26cc7 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/DiffPane/DiffPane.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/DiffPane/DiffPane.tsx
@@ -37,12 +37,15 @@ function ScrollToFile({
 			const scrollContainer = v.getScrollContainerElement();
 			if (!scrollContainer) return;
 
-			const target = scrollContainer.querySelector(
+			const entry = scrollContainer.querySelector(
 				`[data-diff-path="${CSS.escape(path)}"]`,
-			);
-			if (!target) return;
+			) as HTMLElement | null;
+			const header = scrollContainer.querySelector(
+				`[data-diff-entry-header-path="${CSS.escape(path)}"]`,
+			) as HTMLElement | null;
+			if (!entry || !header) return;
 
-			const offset = v.getOffsetInScrollContainer(target as HTMLElement);
+			const offset = v.getOffsetInScrollContainer(header);
 			scrollContainer.scrollTo({ top: offset });
 			lastScrolledPath.current = path;
 			if (focusTick != null) lastFocusTick.current = focusTick;
@@ -54,7 +57,7 @@ function ScrollToFile({
 				// few frames so the annotation slot has time to render.
 				let attempts = 0;
 				const tryScroll = () => {
-					const lineEl = findLineElement(target as HTMLElement, focusLine);
+					const lineEl = findLineElement(entry, focusLine);
 					if (lineEl) {
 						lineEl.scrollIntoView({ block: "center" });
 						return;
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/DiffPane/components/DiffFileEntry/DiffFileEntry.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/DiffPane/components/DiffFileEntry/DiffFileEntry.tsx
index 93f7ac0fced..d29baf00eb0 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/DiffPane/components/DiffFileEntry/DiffFileEntry.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/DiffPane/components/DiffFileEntry/DiffFileEntry.tsx
@@ -184,6 +184,23 @@ export const DiffFileEntry = memo(function DiffFileEntry({
 	}
 
 	const shouldMount = reason ? showFullDiff : hasBeenNearRef.current;
+	const header = (
+		<DiffFileHeader
+			path={file.path}
+			status={file.status}
+			additions={file.additions}
+			deletions={file.deletions}
+			expandUnchanged={expandUnchanged}
+			onToggleExpandUnchanged={handleToggleExpandUnchanged}
+			collapsed={collapsed}
+			onToggleCollapsed={handleToggleCollapsed}
+			viewed={viewed}
+			onToggleViewed={handleToggleViewed}
+			onOpenFile={handleOpenFile}
+			onOpenInExternalEditor={handleOpenInExternalEditor}
+			onDiscard={requestDiscard}
+		/>
+	);
 
 	return (
 		<div
@@ -193,24 +210,15 @@ export const DiffFileEntry = memo(function DiffFileEntry({
 				minHeight: collapsed ? COLLAPSED_HEIGHT_PX : expandedHeight(file),
 			}}
 		>
+			{header}
 			{shouldMount ? (
 				<WorkspaceDiff
 					workspaceId={workspaceId}
 					path={file.path}
-					status={file.status}
 					source={file.source}
-					additions={file.additions}
-					deletions={file.deletions}
 					diffStyle={diffStyle}
 					expandUnchanged={expandUnchanged}
-					onToggleExpandUnchanged={handleToggleExpandUnchanged}
 					collapsed={collapsed}
-					onToggleCollapsed={handleToggleCollapsed}
-					viewed={viewed}
-					onToggleViewed={handleToggleViewed}
-					onOpenFile={handleOpenFile}
-					onOpenInExternalEditor={handleOpenInExternalEditor}
-					onDiscard={requestDiscard}
 					focusLine={focusLine}
 					focusTick={focusTick}
 				/>
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/DiffPane/components/DiffFileHeader/DiffFileHeader.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/DiffPane/components/DiffFileHeader/DiffFileHeader.tsx
index d5a60fa0826..1d4c11dd83a 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/DiffPane/components/DiffFileHeader/DiffFileHeader.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/DiffPane/components/DiffFileHeader/DiffFileHeader.tsx
@@ -52,7 +52,10 @@ export function DiffFileHeader({
 	const name = lastSlash >= 0 ? path.slice(lastSlash + 1) : path;
 
 	return (
-		<div className="group/diff-file-header @container/diff-file-header sticky top-0 z-10 flex min-w-0 flex-nowrap items-center gap-1 bg-card px-3 py-2">
+		<div
+			data-diff-entry-header-path={path}
+			className="group/diff-file-header @container/diff-file-header sticky top-0 z-10 flex min-w-0 flex-nowrap items-center gap-1 bg-card px-3 py-2"
+		>
 			<button
 				type="button"
 				onClick={onToggleCollapsed}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/DiffPane/components/WorkspaceDiff/WorkspaceDiff.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/DiffPane/components/WorkspaceDiff/WorkspaceDiff.tsx
index 0780bcf4ce2..02be8f9592f 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/DiffPane/components/WorkspaceDiff/WorkspaceDiff.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/DiffPane/components/WorkspaceDiff/WorkspaceDiff.tsx
@@ -10,7 +10,6 @@ import {
 import { useResolvedTheme, useTerminalTheme } from "renderer/stores/theme";
 import type { DiffFileSource } from "../../../../../useChangeset";
 import { CommentThread } from "../CommentThread";
-import { DiffFileHeader } from "../DiffFileHeader";
 import {
 	type DiffCommentThread,
 	useDiffAnnotations,
@@ -19,20 +18,10 @@ import {
 interface WorkspaceDiffProps {
 	workspaceId: string;
 	path: string;
-	status: string;
 	source: DiffFileSource;
-	additions: number;
-	deletions: number;
 	diffStyle: "split" | "unified";
 	expandUnchanged: boolean;
-	onToggleExpandUnchanged: () => void;
 	collapsed: boolean;
-	onToggleCollapsed: () => void;
-	viewed: boolean;
-	onToggleViewed: () => void;
-	onOpenFile?: (openInNewTab?: boolean) => void;
-	onOpenInExternalEditor?: () => void;
-	onDiscard?: () => void;
 	focusLine?: number;
 	focusTick?: number;
 }
@@ -40,20 +29,10 @@ interface WorkspaceDiffProps {
 export const WorkspaceDiff = memo(function WorkspaceDiff({
 	workspaceId,
 	path,
-	status,
 	source,
-	additions,
-	deletions,
 	diffStyle,
 	expandUnchanged,
-	onToggleExpandUnchanged,
 	collapsed,
-	onToggleCollapsed,
-	viewed,
-	onToggleViewed,
-	onOpenFile,
-	onOpenInExternalEditor,
-	onDiscard,
 	focusLine,
 	focusTick,
 }: WorkspaceDiffProps) {
@@ -132,21 +111,6 @@ export const WorkspaceDiff = memo(function WorkspaceDiff({
 
 	return (
 		<div className="flex flex-col">
-			<DiffFileHeader
-				path={path}
-				status={status}
-				additions={additions}
-				deletions={deletions}
-				expandUnchanged={expandUnchanged}
-				onToggleExpandUnchanged={onToggleExpandUnchanged}
-				collapsed={collapsed}
-				onToggleCollapsed={onToggleCollapsed}
-				viewed={viewed}
-				onToggleViewed={onToggleViewed}
-				onOpenFile={onOpenFile}
-				onOpenInExternalEditor={onOpenInExternalEditor}
-				onDiscard={onDiscard}
-			/>
 			{diffQuery.data ? (
 				<MultiFileDiff<DiffCommentThread>
 					oldFile={diffQuery.data.oldFile}