diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js
index c766b8a72..b150cca51 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 55474df17..24f70682d 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 4ae58d8f4..755d158c9 100644
--- a/netbox/project-static/src/select/api/apiSelect.ts
+++ b/netbox/project-static/src/select/api/apiSelect.ts
@@ -411,13 +411,12 @@ export class APISelect {
     } finally {
       this.setOptionStyles();
       this.enable();
+      this.base.dispatchEvent(this.loadEvent);
 
-      // Set the focus to the search field if the select is open
-      if (this.slim.slim.content.classList.contains("ss-open")) {
+      // Set the focus to the search field if the select is open and no already in focus
+      if (this.slim.data.contentOpen && document.activeElement !== this.slim.slim.search.input) {
         this.slim.slim.search.input.focus();
       }
-
-      this.base.dispatchEvent(this.loadEvent);
     }
   }