diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js
index 45abd19e6..9215625c8 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 c7e20fe9a..780aa7e03 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 c178a2dbd..25a439eac 100644
--- a/netbox/project-static/src/netbox.ts
+++ b/netbox/project-static/src/netbox.ts
@@ -38,8 +38,8 @@ function initDocument(): void {
 
 function initWindow(): void {
   const contentContainer = document.querySelector<HTMLElement>('.content-container');
-  if (contentContainer !== null) {
-    // Focus the content container for accessible navigation.
+  if (contentContainer !== null && document.activeElement !==null && document.activeElement.tagName.toUpperCase() !== 'INPUT') {
+    // Focus the content container for accessible navigation, unless an input item has focus
     contentContainer.focus();
   }
 }