diff --git a/src/views/projects/Header.svelte b/src/views/projects/Header.svelte
index f9bcce23c..7a4844ef1 100644
--- a/src/views/projects/Header.svelte
+++ b/src/views/projects/Header.svelte
@@ -73,7 +73,9 @@
       revision: undefined,
       path: undefined,
     }}>
-    <SquareButton active={activeRoute.params.view.resource === "issues"}>
+    <SquareButton
+      active={activeRoute.params.view.resource === "issues" ||
+        activeRoute.params.view.resource === "issue"}>
       <span class="txt-bold">{openIssueCount}</span>
       {pluralize("issue", openIssueCount)}
     </SquareButton>
@@ -90,7 +92,9 @@
       revision: undefined,
       path: undefined,
     }}>
-    <SquareButton active={activeRoute.params.view.resource === "patches"}>
+    <SquareButton
+      active={activeRoute.params.view.resource === "patches" ||
+        activeRoute.params.view.resource === "patch"}>
       <span class="txt-bold">{openPatchCount}</span>
       {pluralize("patch", openPatchCount)}
     </SquareButton>
diff --git a/src/views/projects/SourceBrowsingHeader.svelte b/src/views/projects/SourceBrowsingHeader.svelte
index f33e54df4..fd82d7011 100644
--- a/src/views/projects/SourceBrowsingHeader.svelte
+++ b/src/views/projects/SourceBrowsingHeader.svelte
@@ -66,7 +66,9 @@
       revision: revision,
       search: undefined,
     }}>
-    <SquareButton active={activeRoute.params.view.resource === "history"}>
+    <SquareButton
+      active={activeRoute.params.view.resource === "history" ||
+        activeRoute.params.view.resource === "commits"}>
       <span class="txt-bold">{commitCount}</span>
       {pluralize("commit", commitCount)}
     </SquareButton>