diff --git a/src/popup/app/vault/vaultController.js b/src/popup/app/vault/vaultController.js
index 538b8b19..b488271e 100644
--- a/src/popup/app/vault/vaultController.js
+++ b/src/popup/app/vault/vaultController.js
@@ -8,6 +8,7 @@
 
         $scope.i18n = i18nService;
         $scope.showFolderCounts = !utilsService.isEdge();
+        $scope.showOnlyFolderView = utilsService.isEdge();
         $scope.disableSearch = utilsService.isEdge();
         $('#search').focus();
 
diff --git a/src/popup/app/vault/views/vault.html b/src/popup/app/vault/views/vault.html
index 28a9bc49..4a794aed 100644
--- a/src/popup/app/vault/views/vault.html
+++ b/src/popup/app/vault/views/vault.html
@@ -11,7 +11,7 @@
     </div>
 </div>
 <div class="content content-tabs">
-    <div ng-if="vaultLogins.length && vaultLogins.length >= 100 && vaultFolders.length && (!searchText || searchText.length < 2)">
+    <div ng-if="vaultLogins.length && (showOnlyFolderView || vaultLogins.length >= 100) && vaultFolders.length && (!searchText || searchText.length < 2)">
         <div class="list">
             <div class="list-section" style="padding-bottom: 0;">
                 <div class="list-section-header">
@@ -27,7 +27,7 @@
             </div>
         </div>
     </div>
-    <div ng-if="vaultLogins.length && (vaultLogins.length < 100 || (searchText && searchText.length >= 2))">
+    <div ng-if="vaultLogins.length && ((vaultLogins.length < 100 && !showOnlyFolderView) || (searchText && searchText.length >= 2))">
         <div class="list">
             <div class="list-grouped" ng-repeat="folder in vaultFolders | orderBy: folderSort track by $index"
                  ng-show="vaultFolderLogins.length">