diff --git a/src/popup/vault/groupings.component.html b/src/popup/vault/groupings.component.html
index eb41210501..5ae83a8aa2 100644
--- a/src/popup/vault/groupings.component.html
+++ b/src/popup/vault/groupings.component.html
@@ -3,7 +3,8 @@
         <app-pop-out></app-pop-out>
     </div>
     <div class="search">
-        <input type="search" placeholder="{{'searchVault' | i18n}}" id="search" [(ngModel)]="searchText">
+        <input type="search" placeholder="{{'searchVault' | i18n}}" id="search"
+               [(ngModel)]="searchText" appAutofocus>
         <i class="fa fa-search"></i>
     </div>
     <div class="right">
diff --git a/src/popup/vault/groupings.component.ts b/src/popup/vault/groupings.component.ts
index 1626cda2ef..c6d552b196 100644
--- a/src/popup/vault/groupings.component.ts
+++ b/src/popup/vault/groupings.component.ts
@@ -78,8 +78,6 @@ export class GroupingsComponent extends BaseGroupingsComponent implements OnInit
     }
 
     async ngOnInit() {
-        document.getElementById('search').focus();
-
         this.showLeftHeader = !this.platformUtilsService.isSafari() &&
             !(this.popupUtils.inSidebar(window) && this.platformUtilsService.isFirefox());
         this.stateService.remove('CiphersComponent');