diff --git a/web/src/lib/components/repo/DiffFileCard.svelte b/web/src/lib/components/repo/DiffFileCard.svelte
index 7f8673721..a474510fc 100644
--- a/web/src/lib/components/repo/DiffFileCard.svelte
+++ b/web/src/lib/components/repo/DiffFileCard.svelte
@@ -42,7 +42,7 @@
 	}: Props = $props();
 </script>
 
-<!-- the summary sticks below the site header + topbar and needs a solid bg
+<!-- the summary sticks below the topbar and needs a solid bg
      or the diff shows through. z-[5] keeps it under the z-10 topbar it
      shares its sticky band with -->
 <details
@@ -51,7 +51,7 @@
 	class="group mx-auto w-full rounded border border-border-default bg-background-default"
 >
 	<summary
-		class="sticky top-[calc(5.75rem+env(safe-area-inset-top))] z-5 cursor-pointer list-none rounded bg-background-default group-open:rounded-b-none group-open:border-b group-open:border-border-default"
+		class="sticky top-[calc(3rem+env(safe-area-inset-top))] z-5 cursor-pointer list-none rounded bg-background-default group-open:rounded-b-none group-open:border-b group-open:border-border-default"
 	>
 		<div class="flex cursor-pointer justify-between">
 			<div class="flex items-center gap-2 overflow-x-auto p-2">
diff --git a/web/src/lib/components/repo/DiffTopbar.svelte b/web/src/lib/components/repo/DiffTopbar.svelte
index 70fda6778..b85ea875b 100644
--- a/web/src/lib/components/repo/DiffTopbar.svelte
+++ b/web/src/lib/components/repo/DiffTopbar.svelte
@@ -45,7 +45,7 @@
 </script>
 
 <div
-	class="sticky top-[calc(2.75rem+env(safe-area-inset-top))] z-10 flex h-12 items-center gap-2 bg-background-canvas p-2"
+	class="sticky top-[env(safe-area-inset-top)] z-10 flex h-12 items-center gap-2 bg-background-canvas p-2"
 >
 	{#if onToggleFiles}
 		<Button
diff --git a/web/src/lib/components/repo/DiffView.svelte b/web/src/lib/components/repo/DiffView.svelte
index d0c6adb19..f07d50421 100644
--- a/web/src/lib/components/repo/DiffView.svelte
+++ b/web/src/lib/components/repo/DiffView.svelte
@@ -83,7 +83,7 @@
 	<div class="flex grow gap-4">
 		{#if rows.length > 0 && filesOpen}
 			<aside
-				class="sticky top-[calc(5.75rem+env(safe-area-inset-top))] hidden max-h-[calc(100vh-5.75rem-env(safe-area-inset-top))] w-fit max-w-60 shrink-0 overflow-y-auto md:block"
+				class="sticky top-[calc(3rem+env(safe-area-inset-top))] hidden max-h-[calc(100vh-3rem-env(safe-area-inset-top))] w-fit max-w-60 shrink-0 overflow-y-auto md:block"
 			>
 				<section
 					class="mx-auto min-h-full w-full overflow-x-auto rounded border border-border-default bg-background-default px-6 py-2 typography-paragraph-regular"