diff --git a/src/popup/app/vault/vaultController.js b/src/popup/app/vault/vaultController.js
index 84664c5e2a6..523310b5200 100644
--- a/src/popup/app/vault/vaultController.js
+++ b/src/popup/app/vault/vaultController.js
@@ -5,6 +5,7 @@ angular
         syncService, utilsService, $analytics, i18nService, stateService, $timeout, $window, collectionService) {
         var stateKey = 'vault',
             state = stateService.getState(stateKey) || {};
+        stateService.removeState('viewGrouping');
 
         $scope.i18n = i18nService;
         $scope.showGroupingCounts = !utilsService.isEdge();
diff --git a/src/popup/app/vault/views/vaultViewGrouping.html b/src/popup/app/vault/views/vaultViewGrouping.html
index 149350f3335..2b6998bc037 100644
--- a/src/popup/app/vault/views/vaultViewGrouping.html
+++ b/src/popup/app/vault/views/vaultViewGrouping.html
@@ -35,7 +35,7 @@
             </div>
         </div>
     </div>
-    <div class="centered-message" ng-if="loaded && !vaultCiphers.length">
+    <div class="centered-message" ng-if="loaded && !vaultCiphers.length && !searchText">
         <p>
             {{i18n.noItemsInList}}
             <button ng-click="addCipher()" style="margin-top: 20px;" class="btn btn-link btn-block">{{i18n.addItem}}</button>