diff --git a/src/popup/app/vault/vaultViewGroupingController.js b/src/popup/app/vault/vaultViewGroupingController.js
index c36d337415..34873afd94 100644
--- a/src/popup/app/vault/vaultViewGroupingController.js
+++ b/src/popup/app/vault/vaultViewGroupingController.js
@@ -17,15 +17,15 @@ angular
             id: null,
             name: i18nService.noneFolder
         };
-        $scope.folderGrouping = false;
+        $scope.folderGrouping = true;
         $scope.collectionGrouping = false;
 
         if (state.folderId && state.folderId !== '0') {
             $scope.grouping.id = state.folderId;
-            $scope.folderGrouping = true;
         }
         else if (state.collectionId && state.collectionId !== '0') {
             $scope.grouping.id = state.collectionId;
+            $scope.folderGrouping = false;
             $scope.collectionGrouping = true;
         }
 
diff --git a/src/popup/app/vault/views/vault.html b/src/popup/app/vault/views/vault.html
index 647c516b6e..5bfc047bc9 100644
--- a/src/popup/app/vault/views/vault.html
+++ b/src/popup/app/vault/views/vault.html
@@ -41,11 +41,17 @@
                 <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">
-                        <i class="fa fa-fw text-muted"
-                           ng-class="{'fa-folder-open': folder.id, 'fa-folder-open-o': !folder.id}"></i>
-                        {{folder.name}}
-                        <i class="fa fa-chevron-right fa-lg"></i>
-                        <span class="item-sub-label" ng-if="showGroupingCounts">{{folder.itemCount}}</span>
+                        <div class="pull-right">
+                            <i class="fa fa-chevron-right fa-lg"></i>
+                            <span class="item-sub-label" ng-if="showGroupingCounts">{{folder.itemCount}}</span>
+                        </div>
+                        <div class="icon single-line">
+                            <i class="fa fa-fw fa-lg"
+                               ng-class="{'fa-folder-open': folder.id, 'fa-folder-open-o': !folder.id}"></i>
+                        </div>
+                        <span class="text">
+                            {{folder.name}}
+                        </span>
                     </a>
                 </div>
             </div>
@@ -57,10 +63,16 @@
                 <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">
-                        <i class="fa fa-cube fa-fw text-muted"></i>
-                        {{collection.name}}
-                        <i class="fa fa-chevron-right fa-lg"></i>
-                        <span class="item-sub-label" ng-if="showGroupingCounts">{{collection.itemCount}}</span>
+                        <div class="pull-right">
+                            <i class="fa fa-chevron-right fa-lg"></i>
+                            <span class="item-sub-label" ng-if="showGroupingCounts">{{collection.itemCount}}</span>
+                        </div>
+                        <div class="icon single-line">
+                            <i class="fa fa-fw fa-lg fa-cube"></i>
+                        </div>
+                        <span class="text">
+                            {{collection.name}}
+                        </span>
                     </a>
                 </div>
             </div>
diff --git a/src/popup/less/components.less b/src/popup/less/components.less
index b1e36eb8dd..058a1f7396 100644
--- a/src/popup/less/components.less
+++ b/src/popup/less/components.less
@@ -1,4 +1,4 @@
-@import (reference) "variables.less";
+@import (reference) "variables.less";
 @import (reference) "mixins.less";
 
 .header {
@@ -364,10 +364,14 @@
                 max-height: 20px;
                 max-width: 20px;
             }
+
+            &.single-line {
+                height: initial;
+                display: block;
+                text-align: center;
+            }
         }
 
-
-
         .action-buttons {
             float: right;