diff --git a/jslib b/jslib
index b3d1e9d233..57e49207e9 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit b3d1e9d233aa7ed235d6ec0b26cdba41afa065ae
+Subproject commit 57e49207e9ad57c71576fc487a38513a4d0fe120
diff --git a/src/popup/vault/ciphers.component.ts b/src/popup/vault/ciphers.component.ts
index d2be245fae..b64ea9ba61 100644
--- a/src/popup/vault/ciphers.component.ts
+++ b/src/popup/vault/ciphers.component.ts
@@ -72,6 +72,13 @@ export class CiphersComponent extends BaseCiphersComponent implements OnInit, On
     async ngOnInit() {
         this.searchTypeSearch = !this.platformUtilsService.isSafari();
         const queryParamsSub = this.route.queryParams.subscribe(async (params) => {
+            if (this.applySavedState) {
+                this.state = (await this.stateService.get<any>(ComponentId)) || {};
+                if (this.state.searchText) {
+                    this.searchText = this.state.searchText;
+                }
+            }
+
             if (params.type) {
                 this.searchPlaceholder = this.i18nService.t('searchType');
                 this.type = parseInt(params.type, null);
@@ -121,11 +128,7 @@ export class CiphersComponent extends BaseCiphersComponent implements OnInit, On
                 await this.load();
             }
 
-            if (this.applySavedState) {
-                this.state = (await this.stateService.get<any>(ComponentId)) || {};
-                if (this.state.searchText) {
-                    this.searchText = this.state.searchText;
-                }
+            if (this.applySavedState && this.state != null) {
                 window.setTimeout(() => this.popupUtils.setContentScrollY(window, this.state.scrollY), 0);
             }
             this.stateService.remove(ComponentId);