diff --git a/src/popup/app/settings/folders/folders.component.html b/src/popup/app/settings/folders/folders.component.html
index def7e41ce68..5de3a848b11 100644
--- a/src/popup/app/settings/folders/folders.component.html
+++ b/src/popup/app/settings/folders/folders.component.html
@@ -12,7 +12,7 @@
         <div class="list">
             <div class="list-grouped">
                 <a href="" ng-click="$ctrl.editFolder(folder)" class="list-grouped-item" title="{{::$ctrl.i18n.edit}}"
-                   ng-repeat="folder in theFolders = ($ctrl.folders | orderBy: ['name']) track by $index">
+                   ng-repeat="folder in $ctrl.folders track by $index">
                     <span class="text">{{folder.name}}</span>
                 </a>
             </div>
diff --git a/src/popup/app/settings/folders/folders.component.ts b/src/popup/app/settings/folders/folders.component.ts
index 6c8752ba68b..30891ec5968 100644
--- a/src/popup/app/settings/folders/folders.component.ts
+++ b/src/popup/app/settings/folders/folders.component.ts
@@ -16,9 +16,9 @@ export class FoldersController {
 
     load() {
         this.folderService.getAllDecrypted().then((folders: any) => {
-            if (folders.length > 0 && folders[0].id === null) {
+            if (folders.length > 0 && folders[folders.length - 1].id === null) {
                 // remove the "none" folder
-                this.folders = folders.slice(1);
+                this.folders = folders.slice(0, folders.length - 1);
             } else {
                 this.folders = folders;
             }
diff --git a/src/popup/app/vault/vaultController.js b/src/popup/app/vault/vaultController.js
index 3125ca7956f..28c5e4aaf6d 100644
--- a/src/popup/app/vault/vaultController.js
+++ b/src/popup/app/vault/vaultController.js
@@ -34,6 +34,9 @@ angular
 
             if (!$rootScope.vaultCollections || !$rootScope.vaultCollections.length) {
                 $scope.noFolderCiphers = $filter('filter')($rootScope.vaultCiphers, { folderId: null });
+                if ($scope.noFolderCiphers.length >= 100) {
+                    $scope.noFolderCiphers = null;
+                }
             }
         }
 
@@ -83,9 +86,13 @@ angular
 
                 if (!$rootScope.vaultCollections || !$rootScope.vaultCollections.length) {
                     $scope.noFolderCiphers = $filter('filter')($rootScope.vaultCiphers, { folderId: null });
+                    if ($scope.noFolderCiphers.length >= 100) {
+                        $scope.noFolderCiphers = null;
+                    }
 
-                    if ($rootScope.vaultFolders && $rootScope.vaultFolders.length && !$rootScope.vaultFolders[0].id) {
-                        $rootScope.vaultFolders = $rootScope.vaultFolders.slice(1);
+                    if ($scope.noFolderCiphers && $rootScope.vaultFolders && $rootScope.vaultFolders.length &&
+                        !$rootScope.vaultFolders[$rootScope.vaultFolders.length - 1].id) {
+                        $rootScope.vaultFolders = $rootScope.vaultFolders.slice(0, $rootScope.vaultFolders.length - 1);
                     }
                 }
 
@@ -134,14 +141,6 @@ angular
             $scope.searchText = state.searchText || $stateParams.searchText;
         }
 
-        $scope.folderSort = function (item) {
-            if (!item.id) {
-                return '';
-            }
-
-            return item.name.toLowerCase();
-        };
-
         $scope.searchCiphers = function () {
             if (!$scope.searchText || $scope.searchText.length < 2) {
                 return;
diff --git a/src/popup/app/vault/views/vault.html b/src/popup/app/vault/views/vault.html
index 66d15d984e5..d37c902b5fc 100644
--- a/src/popup/app/vault/views/vault.html
+++ b/src/popup/app/vault/views/vault.html
@@ -20,7 +20,7 @@
                 <div class="list-section-items">
                     <a href="#" stop-click ng-click="viewCipher(cipher)" class="list-section-item condensed"
                        title="{{::i18n.view}}"
-                       ng-repeat="cipher in favoriteCiphers | orderBy: ['name', 'subTitle'] track by $index">
+                       ng-repeat="cipher in favoriteCiphers track by $index">
                         <action-buttons cipher="cipher"></action-buttons>
                         <icon cipher="cipher"></icon>
                         <span class="text">
@@ -39,7 +39,7 @@
                 </div>
                 <div class="list-section-items">
                     <a href="#" stop-click ng-click="viewGrouping(folder, true)" class="list-section-item"
-                       ng-repeat="folder in vaultFolders | orderBy: folderSort track by $index">
+                       ng-repeat="folder in vaultFolders track by $index">
                         <div class="pull-right">
                             <i class="fa fa-chevron-right fa-lg"></i>
                             <span class="item-sub-label" ng-if="showGroupingCounts">{{folder.itemCount}}</span>
@@ -61,7 +61,7 @@
                 </div>
                 <div class="list-section-items">
                     <a href="#" stop-click ng-click="viewGrouping(collection, false)" class="list-section-item"
-                       ng-repeat="collection in vaultCollections | orderBy: ['name'] track by $index">
+                       ng-repeat="collection in vaultCollections track by $index">
                         <div class="pull-right">
                             <i class="fa fa-chevron-right fa-lg"></i>
                             <span class="item-sub-label" ng-if="showGroupingCounts">{{collection.itemCount}}</span>
@@ -83,7 +83,7 @@
                 <div class="list-section-items">
                     <a href="#" stop-click ng-click="viewCipher(cipher)" class="list-section-item condensed"
                        title="{{::i18n.view}}"
-                       ng-repeat="cipher in noFolderCiphers | orderBy: ['name', 'subTitle'] track by $index">
+                       ng-repeat="cipher in noFolderCiphers track by $index">
                         <action-buttons cipher="cipher"></action-buttons>
                         <icon cipher="cipher"></icon>
                         <span class="text">
@@ -103,8 +103,7 @@
             <div class="list-section" style="padding-top: 0; padding-bottom: 0;">
                 <a href="#" stop-click ng-click="viewCipher(cipher)"
                    class="list-section-item condensed" title="{{::i18n.view}}"
-                   ng-repeat="cipher in searchResults = (vaultCiphers | filter: searchCiphers() | orderBy: ['name', 'subTitle'])
-                    track by $index">
+                   ng-repeat="cipher in searchResults = (vaultCiphers | filter: searchCiphers() track by $index">
                     <action-buttons cipher="cipher"></action-buttons>
                     <icon cipher="cipher"></icon>
                     <span class="text">
diff --git a/src/popup/app/vault/views/vaultAddCipher.html b/src/popup/app/vault/views/vaultAddCipher.html
index 524d1a464d1..558798ca191 100644
--- a/src/popup/app/vault/views/vaultAddCipher.html
+++ b/src/popup/app/vault/views/vaultAddCipher.html
@@ -242,7 +242,7 @@
                     <div class="list-section-item">
                         <label for="folder" class="item-label">{{i18n.folder}}</label>
                         <select id="folder" name="FolderId" ng-model="cipher.folderId">
-                            <option ng-repeat="folder in folders | orderBy: ['name'] track by $index" value="{{folder.id}}">
+                            <option ng-repeat="folder in folders track by $index" value="{{folder.id}}">
                                 {{folder.name}}
                             </option>
                         </select>
diff --git a/src/popup/app/vault/views/vaultEditCipher.html b/src/popup/app/vault/views/vaultEditCipher.html
index 6b3e31d3d78..98b36ef7d70 100644
--- a/src/popup/app/vault/views/vaultEditCipher.html
+++ b/src/popup/app/vault/views/vaultEditCipher.html
@@ -235,7 +235,7 @@
                     <div class="list-section-item">
                         <label for="folder" class="item-label">{{i18n.folder}}</label>
                         <select id="folder" name="FolderId" ng-model="cipher.folderId">
-                            <option ng-repeat="folder in folders | orderBy: ['name'] track by $index" value="{{folder.id}}">
+                            <option ng-repeat="folder in folders track by $index" value="{{folder.id}}">
                                 {{folder.name}}
                             </option>
                         </select>