diff --git a/apps/web/src/lib/components/review/ChangeNavigator.svelte b/apps/web/src/lib/components/review/ChangeNavigator.svelte
index 844c641444..59d2e51c73 100644
--- a/apps/web/src/lib/components/review/ChangeNavigator.svelte
+++ b/apps/web/src/lib/components/review/ChangeNavigator.svelte
@@ -8,9 +8,9 @@
 	}
 
 	const { patchIds, currentPatchId, goToPatch }: Props = $props();
-	const index = patchIds.indexOf(currentPatchId);
-	const previousPatchId = patchIds[index - 1];
-	const nextPatchId = patchIds[index + 1];
+	const index = $derived(patchIds.indexOf(currentPatchId));
+	const previousPatchId = $derived(patchIds[index + 1]);
+	const nextPatchId = $derived(patchIds[index - 1]);
 
 	function handleNavigateBack() {
 		if (previousPatchId) {
@@ -32,7 +32,7 @@
 		class="navigate-prev"
 		onclick={handleNavigateBack}><Icon name="chevron-left" /></button
 	>
-	<div class="indicator">Patch {index + 1}/{patchIds?.length}</div>
+	<div class="indicator">Patch {patchIds?.length - index}/{patchIds?.length}</div>
 	<button
 		type="button"
 		disabled={!nextPatchId}
diff --git a/apps/web/src/routes/[ownerSlug]/[projectSlug]/reviews/[branchId]/+page.svelte b/apps/web/src/routes/[ownerSlug]/[projectSlug]/reviews/[branchId]/+page.svelte
index 7f2baae864..c270c2b16f 100644
--- a/apps/web/src/routes/[ownerSlug]/[projectSlug]/reviews/[branchId]/+page.svelte
+++ b/apps/web/src/routes/[ownerSlug]/[projectSlug]/reviews/[branchId]/+page.svelte
@@ -69,7 +69,7 @@
 	function visitFirstCommit(branch: Branch) {
 		if ((branch.patchIds?.length || 0) === 0) return;
 
-		goto(routes.projectReviewBranchCommitPath({ ...data, changeId: branch.patchIds[0] }));
+		goto(routes.projectReviewBranchCommitPath({ ...data, changeId: branch.patchIds.at(-1)! }));
 	}
 
 	let editingSummary = $state(false);