diff --git a/app/app.js b/app/app.js
index a988d54..e4a71a9 100644
--- a/app/app.js
+++ b/app/app.js
@@ -3,6 +3,7 @@ import compatModules from '@embroider/virtual/compat-modules';
 import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from 'rfcs-app/config/environment';
+import 'ember-a11y-refocus/styles';
 
 export default class App extends Application {
   modulePrefix = config.modulePrefix;
diff --git a/app/templates/application.gjs b/app/templates/application.gjs
index 6f0570b..0a92d33 100644
--- a/app/templates/application.gjs
+++ b/app/templates/application.gjs
@@ -2,10 +2,13 @@ import { pageTitle } from 'ember-page-title';
 import { LinkTo } from '@ember/routing';
 import EsHeader from 'ember-styleguide/components/es-header';
 import EsSidebar from 'ember-styleguide/components/es-sidebar';
+import { NavigationNarrator } from 'ember-a11y-refocus';
 
 <template>
   {{pageTitle "Ember.js RFCs"}}
-  <EsHeader />
+  <EsHeader>
+    <NavigationNarrator />
+  </EsHeader>
   <main class="sidebar-container sidebar-container--full-width">
     <EsSidebar>
       <ul class="table-of-contents">
diff --git a/package.json b/package.json
index 4acf439..99a9d80 100644
--- a/package.json
+++ b/package.json
@@ -56,6 +56,7 @@
     "concurrently": "^9.1.2",
     "decorator-transforms": "^2.3.0",
     "downsize-cjs": "^1.1.2",
+    "ember-a11y-refocus": "github:mansona/ember-a11y-refocus#import-styles&path:addon",
     "ember-auto-import": "^2.10.0",
     "ember-cli": "~6.5.0-beta.0",
     "ember-cli-babel": "^8.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ec027e0..fceba49 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -77,6 +77,9 @@ importers:
       downsize-cjs:
         specifier: ^1.1.2
         version: 1.1.2
+      ember-a11y-refocus:
+        specifier: github:mansona/ember-a11y-refocus#import-styles&path:addon
+        version: https://codeload.github.com/mansona/ember-a11y-refocus/tar.gz/c61fcd954cf442fd82d5b26a671ccca87125587e#path:addon(@babel/core@7.27.4)(ember-source@6.5.0-beta.2(@glimmer/component@2.0.0)(rsvp@4.8.5))
       ember-auto-import:
         specifier: ^2.10.0
         version: 2.10.0(webpack@4.47.0)
@@ -3702,6 +3705,12 @@ packages:
   elliptic@6.6.1:
     resolution: {integrity: sha512-RaddvvMatK2LJHqFJ+YA4WysVN5Ita9E35botqIYspQ4TkRAlCicdzKOjlyv/1Za5RyTNn7di//eEV0uTAfe3g==}
 
+  ember-a11y-refocus@https://codeload.github.com/mansona/ember-a11y-refocus/tar.gz/c61fcd954cf442fd82d5b26a671ccca87125587e#path:addon:
+    resolution: {path: addon, tarball: https://codeload.github.com/mansona/ember-a11y-refocus/tar.gz/c61fcd954cf442fd82d5b26a671ccca87125587e}
+    version: 5.0.0
+    peerDependencies:
+      ember-source: '>= 4.12.0'
+
   ember-auto-import@2.10.0:
     resolution: {integrity: sha512-bcBFDYVTFHyqyq8BNvsj6UO3pE6Uqou/cNmee0WaqBgZ+1nQqFz0UE26usrtnFAT+YaFZSkqF2H36QW84k0/cg==}
     engines: {node: 12.* || 14.* || >= 16}
@@ -12447,6 +12456,17 @@ snapshots:
       minimalistic-assert: 1.0.1
       minimalistic-crypto-utils: 1.0.1
 
+  ember-a11y-refocus@https://codeload.github.com/mansona/ember-a11y-refocus/tar.gz/c61fcd954cf442fd82d5b26a671ccca87125587e#path:addon(@babel/core@7.27.4)(ember-source@6.5.0-beta.2(@glimmer/component@2.0.0)(rsvp@4.8.5)):
+    dependencies:
+      '@embroider/addon-shim': 1.10.0
+      '@glimmer/component': 2.0.0
+      '@glimmer/tracking': 1.1.2
+      decorator-transforms: 2.3.0(@babel/core@7.27.4)
+      ember-source: 6.5.0-beta.2(@glimmer/component@2.0.0)(rsvp@4.8.5)
+    transitivePeerDependencies:
+      - '@babel/core'
+      - supports-color
+
   ember-auto-import@2.10.0(webpack@4.47.0):
     dependencies:
       '@babel/core': 7.27.4