diff --git a/packages/frontend/app/components/global-search-box.hbs b/packages/frontend/app/components/global-search-box.hbs
index 679fbf05d5..635cc31119 100644
--- a/packages/frontend/app/components/global-search-box.hbs
+++ b/packages/frontend/app/components/global-search-box.hbs
@@ -7,7 +7,6 @@
     data-test-input
     type="search"
     value={{this.computedQuery}}
-    {{did-insert (set this "searchInputElement")}}
     {{on
       "input"
       (queue
diff --git a/packages/frontend/app/components/global-search-box.js b/packages/frontend/app/components/global-search-box.js
index 87b6d2193e..8371648adb 100644
--- a/packages/frontend/app/components/global-search-box.js
+++ b/packages/frontend/app/components/global-search-box.js
@@ -18,7 +18,6 @@ export default class GlobalSearchBox extends Component {
   @tracked autocompleteCache = [];
   @tracked autocompleteSelectedQuery;
   @tracked internalQuery;
-  @tracked searchInputElement;
   @tracked results = null;
 
   get hasResults() {
@@ -36,8 +35,10 @@ export default class GlobalSearchBox extends Component {
   }
 
   @action
-  focusAndSearch() {
-    this.searchInputElement.focus();
+  focusAndSearch(event) {
+    const searchInputElement =
+      event.currentTarget.parentElement.getElementsByClassName('global-search-input')[0];
+    searchInputElement.focus();
     this.search();
   }