diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js
index b611079e1..c766b8a72 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 494ba0b56..55474df17 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/select/api/apiSelect.ts b/netbox/project-static/src/select/api/apiSelect.ts
index 798694f0e..4ae58d8f4 100644
--- a/netbox/project-static/src/select/api/apiSelect.ts
+++ b/netbox/project-static/src/select/api/apiSelect.ts
@@ -411,7 +411,12 @@ export class APISelect {
     } finally {
       this.setOptionStyles();
       this.enable();
-      this.slim.slim.search.input.focus();
+
+      // Set the focus to the search field if the select is open
+      if (this.slim.slim.content.classList.contains("ss-open")) {
+        this.slim.slim.search.input.focus();
+      }
+
       this.base.dispatchEvent(this.loadEvent);
     }
   }