diff --git a/src/main.ts b/src/main.ts
index 235060f..0bf803b 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -675,9 +675,13 @@ function setStage(stage: 'shape' | 'plan' | 'rebar'): void {
   $<HTMLElement>('view-shape').hidden = stage !== 'shape';
   $<HTMLElement>('view-plan').hidden = stage !== 'plan';
   $<HTMLElement>('view-rebar').hidden = stage !== 'rebar';
-  $<HTMLButtonElement>('nav-shape').setAttribute('aria-current', String(stage === 'shape'));
-  $<HTMLButtonElement>('nav-plan').setAttribute('aria-current', String(stage === 'plan'));
-  $<HTMLButtonElement>('nav-rebar').setAttribute('aria-current', String(stage === 'rebar'));
+  // The highlight is the 'current' class (style.css); aria-current is set alongside it for assistive tech.
+  const nav: [string, 'shape' | 'plan' | 'rebar'][] = [['nav-shape', 'shape'], ['nav-plan', 'plan'], ['nav-rebar', 'rebar']];
+  for (const [id, key] of nav) {
+    const btn = $<HTMLButtonElement>(id);
+    btn.classList.toggle('current', stage === key);
+    btn.setAttribute('aria-current', String(stage === key));
+  }
   renderAll();
 }