diff --git a/src/popup/app/vault/vaultController.js b/src/popup/app/vault/vaultController.js
index 654f5a652a..e232b6fb4c 100644
--- a/src/popup/app/vault/vaultController.js
+++ b/src/popup/app/vault/vaultController.js
@@ -8,7 +8,6 @@ angular
 
         $scope.i18n = i18nService;
         $scope.showFolderCounts = !utilsService.isEdge();
-        $scope.showOnlyFolderView = utilsService.isEdge();
         $scope.disableSearch = utilsService.isEdge();
         document.getElementById('search').focus();
 
diff --git a/src/popup/app/vault/views/vault.html b/src/popup/app/vault/views/vault.html
index 4e701dc6fa..e27a56d751 100644
--- a/src/popup/app/vault/views/vault.html
+++ b/src/popup/app/vault/views/vault.html
@@ -10,7 +10,7 @@
 </div>
 <div class="content content-tabs">
     <!-- Folder List -->
-    <div ng-if="vaultCiphers.length && (showOnlyFolderView || vaultCiphers.length >= 100) && vaultFolders.length && (!searchText || searchText.length < 2)">
+    <div ng-if="vaultCiphers.length && vaultFolders.length && (!searchText || searchText.length < 2)">
         <div class="list">
             <div class="list-section" style="padding-bottom: 0;">
                 <div class="list-section-header">
@@ -26,31 +26,6 @@
             </div>
         </div>
     </div>
-    <!-- Grouped List -->
-    <div ng-if="vaultCiphers.length && !showOnlyFolderView && vaultCiphers.length < 100 && (!searchText || searchText.length < 2)">
-        <div class="list">
-            <div class="list-grouped" ng-repeat="folder in vaultFolders | orderBy: folderSort track by $index"
-                 ng-show="vaultFolderCiphers.length">
-                <div class="list-grouped-header">
-                    <small>{{vaultFolderCiphers.length}}</small>
-                    <i class="fa fa-folder-open"></i> {{folder.name}}
-                </div>
-                <a href="#" stop-click ng-click="viewCipher(cipher)"
-                   class="list-grouped-item condensed" title="{{::i18n.view}}"
-                   ng-repeat="cipher in vaultFolderCiphers = (vaultCiphers | filter: { folderId: folder.id }
-                            | filter: searchCiphers() | orderBy: ['name', 'subTitle']) track by $index">
-                    <action-buttons cipher="cipher"></action-buttons>
-                    <icon cipher="cipher"></icon>
-                    <span class="text">
-                        {{cipher.name}}
-                        <i class="fa fa-share-alt text-muted" ng-if="cipher.organizationId" title="{{::i18n.shared}}"></i>
-                        <i class="fa fa-paperclip text-muted" ng-if="cipher.attachments" title="{{::i18n.attachments}}"></i>
-                    </span>
-                    <span class="detail">{{cipher.subTitle}}</span>
-                </a>
-            </div>
-        </div>
-    </div>
     <!-- Search Results List -->
     <div ng-if="vaultCiphers.length && searchText && searchText.length >= 2">
         <div class="list">