diff --git a/web/src/lib/components/repo/DiffFileHeader.svelte b/web/src/lib/components/repo/DiffFileHeader.svelte
index 44f7a83ee..ad0cff4da 100644
--- a/web/src/lib/components/repo/DiffFileHeader.svelte
+++ b/web/src/lib/components/repo/DiffFileHeader.svelte
@@ -30,20 +30,33 @@
 	);
 </script>
 
+{#snippet path(name: string)}
+	{@const cut = name.lastIndexOf("/")}
+	<span class="flex min-w-0 flex-1 items-center overflow-hidden">
+		<span class="min-w-0 truncate">{cut === -1 ? name : name.slice(0, cut)}</span>
+		{#if cut !== -1}
+			<span class="shrink-0">{name.slice(cut)}</span>
+		{/if}
+	</span>
+{/snippet}
+
 <FileCardHeader {open} collapsible={!empty && onToggle != null} spacer={empty} {onToggle}>
 	{#snippet title()}
-		<DiffStatPill stat={file.stat} size="small" />
-		<div class="flex items-center gap-2 overflow-x-auto">
+		<DiffStatPill stat={file.stat} size="small" class="shrink-0" />
+		<div class="flex min-w-0 items-center gap-2">
 			{#if renamed}
-				{file.oldName}
-				<ArrowRight class="size-4" />
-				{file.name}
+				{@render path(file.oldName ?? "")}
+				<ArrowRight class="size-4 shrink-0" />
+				{@render path(file.name)}
 			{:else}
-				<span>{file.name}</span>
+				{@render path(file.name)}
 			{/if}
 		</div>
 		{#if liveNote}
-			<span class="typography-paragraph-small text-foreground-muted">{liveNote}</span>
+			<span
+				class="shrink-0 typography-paragraph-small whitespace-nowrap text-foreground-muted"
+				>{liveNote}</span
+			>
 		{/if}
 	{/snippet}
 
diff --git a/web/src/lib/components/repo/FileCardHeader.svelte b/web/src/lib/components/repo/FileCardHeader.svelte
index d325177ad..50bb9e3af 100644
--- a/web/src/lib/components/repo/FileCardHeader.svelte
+++ b/web/src/lib/components/repo/FileCardHeader.svelte
@@ -25,7 +25,7 @@
 
 	const isInteractive = $derived(collapsible && onToggle != null);
 	const titleClass =
-		"flex min-w-0 flex-1 items-center gap-2 overflow-x-auto px-2.5 py-2 text-left select-none";
+		"flex min-w-0 flex-1 items-center gap-2 overflow-hidden px-2.5 py-2 text-left select-none";
 </script>
 
 <div