diff --git a/netbox/project-static/dist/netbox-dark.css b/netbox/project-static/dist/netbox-dark.css
index 0d06bf3e7..6be4204fc 100644
Binary files a/netbox/project-static/dist/netbox-dark.css and b/netbox/project-static/dist/netbox-dark.css differ
diff --git a/netbox/project-static/dist/netbox-light.css b/netbox/project-static/dist/netbox-light.css
index a5ffc8a33..e321f1d50 100644
Binary files a/netbox/project-static/dist/netbox-light.css and b/netbox/project-static/dist/netbox-light.css differ
diff --git a/netbox/project-static/dist/netbox-print.css b/netbox/project-static/dist/netbox-print.css
index 9ed8db851..4bfbe2c31 100644
Binary files a/netbox/project-static/dist/netbox-print.css and b/netbox/project-static/dist/netbox-print.css differ
diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js
index 316cf614c..ced24d759 100644
Binary files a/netbox/project-static/dist/netbox.js and b/netbox/project-static/dist/netbox.js differ
diff --git a/netbox/project-static/dist/netbox.js.map b/netbox/project-static/dist/netbox.js.map
index 73d498353..f3770e462 100644
Binary files a/netbox/project-static/dist/netbox.js.map and b/netbox/project-static/dist/netbox.js.map differ
diff --git a/netbox/project-static/src/netbox.ts b/netbox/project-static/src/netbox.ts
index 6b887a1bc..0b61fc8e3 100644
--- a/netbox/project-static/src/netbox.ts
+++ b/netbox/project-static/src/netbox.ts
@@ -13,7 +13,7 @@ import { initSideNav } from './sidenav';
 import { initRackElevation } from './racks';
 import { initLinks } from './links';
 
-function initAll() {
+function initDocument() {
   for (const init of [
     initBootstrap,
     initColorMode,
@@ -34,8 +34,18 @@ function initAll() {
   }
 }
 
-if (document.readyState !== 'loading') {
-  initAll();
-} else {
-  document.addEventListener('DOMContentLoaded', initAll);
+function initWindow() {
+  const contentContainer = document.querySelector<HTMLElement>('.content-container');
+  if (contentContainer !== null) {
+    // Focus the content container for accessible navigation.
+    contentContainer.focus();
+  }
+}
+
+window.addEventListener('load', initWindow);
+
+if (document.readyState !== 'loading') {
+  initDocument();
+} else {
+  document.addEventListener('DOMContentLoaded', initDocument);
 }
diff --git a/netbox/project-static/styles/netbox.scss b/netbox/project-static/styles/netbox.scss
index 95d45b02b..8f0f174c1 100644
--- a/netbox/project-static/styles/netbox.scss
+++ b/netbox/project-static/styles/netbox.scss
@@ -529,14 +529,20 @@ div.content-container {
   overflow-x: hidden;
   overflow-y: auto;
 
-  @include media-breakpoint-down(lg) {
-    width: 100%;
+  // Don't show an outline when the content container is focused.
+  &:focus,
+  &:focus-visible {
+    outline: 0;
   }
 
   div.content {
     flex: 1;
   }
 
+  @include media-breakpoint-down(lg) {
+    width: 100%;
+  }
+
   // Make the content full-width when printing.
   @media print {
     width: 100% !important;
diff --git a/netbox/templates/base/layout.html b/netbox/templates/base/layout.html
index fbadf595d..c5923b468 100644
--- a/netbox/templates/base/layout.html
+++ b/netbox/templates/base/layout.html
@@ -13,7 +13,7 @@
     {% include 'base/sidenav.html' %}
 
       {# Body #}
-      <div class="content-container">
+      <div class="content-container" tabindex="-2">
 
         {# Netbox Logo, only visible when printing #}
         <div class="p-2 printonly">