diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js
index 45abd19e6..c1116d1dc 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..a5ba2036c 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..656ed56e5 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.tagName.toUpperCase() !== 'INPUT') {
+    // Focus the content container for accessible navigation, unless an input item has focus
     contentContainer.focus();
   }
 }
diff --git a/netbox/utilities/templates/search/searchbar.html b/netbox/utilities/templates/search/searchbar.html
index d71fd8e69..76ea603f8 100644
--- a/netbox/utilities/templates/search/searchbar.html
+++ b/netbox/utilities/templates/search/searchbar.html
@@ -5,9 +5,10 @@
     aria-label="Search"
     placeholder="Search"
     class="form-control"
-    value="{{ request.GET.q }}"
-  />
-
+    value=""
+    {% if request.GET.q %}autofocus
+    onfocus="this.value = '{{ request.GET.q }}';" {% endif %}
+    />
   <input name="obj_type" hidden type="text" class="search-obj-type" />
 
   <span class="input-group-text search-obj-selected">All Objects</span>