diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-search/vault-v2-search.component.html b/apps/browser/src/vault/popup/components/vault-v2/vault-search/vault-v2-search.component.html
index 55674aa83e5..898d93da32c 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-search/vault-v2-search.component.html
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-search/vault-v2-search.component.html
@@ -3,6 +3,7 @@
     [placeholder]="'search' | i18n"
     [(ngModel)]="searchText"
     (ngModelChange)="onSearchTextChanged()"
+    appAutofocus
   >
   </bit-search>
 </div>
diff --git a/apps/browser/src/vault/popup/components/vault/vault-v2.component.html b/apps/browser/src/vault/popup/components/vault/vault-v2.component.html
index e402e131436..04b6bed469b 100644
--- a/apps/browser/src/vault/popup/components/vault/vault-v2.component.html
+++ b/apps/browser/src/vault/popup/components/vault/vault-v2.component.html
@@ -23,7 +23,11 @@
   </div>
 
   <!-- Show search & filters outside of the scroll area of the page -->
-  <div slot="above-scroll-area" class="tw-p-4" *ngIf="vaultState !== VaultStateEnum.Empty">
+  <div
+    slot="above-scroll-area"
+    class="tw-p-4"
+    *ngIf="vaultState !== VaultStateEnum.Empty && !(loading$ | async)"
+  >
     <app-vault-v2-search> </app-vault-v2-search>
     <app-vault-list-filters></app-vault-list-filters>
   </div>