diff --git a/frontend/src/app/modules/global_search/global-search-input.component.ts b/frontend/src/app/modules/global_search/global-search-input.component.ts
index d240d278dd..5ddbc46217 100644
--- a/frontend/src/app/modules/global_search/global-search-input.component.ts
+++ b/frontend/src/app/modules/global_search/global-search-input.component.ts
@@ -137,6 +137,8 @@ export class GlobalSearchInputComponent implements OnInit, OnDestroy {
         this.toggleMobileSearch();
         // open ng-select menu on default
         jQuery('.ng-input input').focus();
+      } else if (this.ngSelectComponent.filterValue.length === 0) {
+        this.ngSelectComponent.focus();
       } else {
         this.submitNonEmptySearch();
       }