diff --git a/src/popup/app/vault/views/vault.html b/src/popup/app/vault/views/vault.html
index 6143b475ec..d9b5fe11c1 100644
--- a/src/popup/app/vault/views/vault.html
+++ b/src/popup/app/vault/views/vault.html
@@ -24,29 +24,28 @@
     </div>
     <div ng-if="vaultLogins.length && (vaultLogins.length < 100 || (searchText && searchText.length >= 2))">
         <div class="list">
-            <div class="list-grouped" ng-repeat="folder in vaultFolders | orderBy: folderSort" ng-show="vaultFolders.length">
-                <div ng-if="(vaultLogins | filter: { folderId: folder.id } | filter: searchLogins()).length">
-                    <div class="list-grouped-header">
-                        <i class="fa fa-folder-open"></i> {{folder.name}}
-                    </div>
-                    <a href="javascript:void(0)" ng-click="viewLogin(login)"
-                       class="list-grouped-item condensed" title="{{i18n.edit}} {{login.name}}"
-                       ng-repeat="login in vaultLogins | filter: { folderId: folder.id }
-                            | filter: searchLogins() | orderBy: ['name', 'username']">
-                        <span class="btn-list" ng-click="$event.stopPropagation()" title="{{i18n.copyPassword}}" ngclipboard
-                              ngclipboard-error="clipboardError(e)" ngclipboard-success="clipboardSuccess(e, i18n.password)"
-                              data-clipboard-text="{{login.password}}" ng-class="{'disabled': !login.password}">
-                            <i class="fa fa-lg fa-key"></i>
-                        </span>
-                        <span class="btn-list" ng-click="$event.stopPropagation()" title="{{i18n.copyUsername}}" ngclipboard
-                              ngclipboard-error="clipboardError(e)" ngclipboard-success="clipboardSuccess(e, i18n.username)"
-                              data-clipboard-text="{{login.username}}" ng-class="{'disabled': !login.username}">
-                            <i class="fa fa-lg fa-user"></i>
-                        </span>
-                        <span class="text">{{login.name}}</span>
-                        <span class="detail">{{login.username}}</span>
-                    </a>
+            <div class="list-grouped" ng-repeat="folder in vaultFolders | orderBy: folderSort" ng-show="vaultFolderLogins.length">
+                <div class="list-grouped-header">
+                    <i class="fa fa-folder-open"></i> {{folder.name}}
+                    <small>{{vaultFolderLogins.length}}</small>
                 </div>
+                <a href="javascript:void(0)" ng-click="viewLogin(login)"
+                   class="list-grouped-item condensed" title="{{i18n.edit}} {{login.name}}"
+                   ng-repeat="login in vaultFolderLogins = (vaultLogins | filter: { folderId: folder.id }
+                            | filter: searchLogins() | orderBy: ['name', 'username'])">
+                    <span class="btn-list" ng-click="$event.stopPropagation()" title="{{i18n.copyPassword}}" ngclipboard
+                          ngclipboard-error="clipboardError(e)" ngclipboard-success="clipboardSuccess(e, i18n.password)"
+                          data-clipboard-text="{{login.password}}" ng-class="{'disabled': !login.password}">
+                        <i class="fa fa-lg fa-key"></i>
+                    </span>
+                    <span class="btn-list" ng-click="$event.stopPropagation()" title="{{i18n.copyUsername}}" ngclipboard
+                          ngclipboard-error="clipboardError(e)" ngclipboard-success="clipboardSuccess(e, i18n.username)"
+                          data-clipboard-text="{{login.username}}" ng-class="{'disabled': !login.username}">
+                        <i class="fa fa-lg fa-user"></i>
+                    </span>
+                    <span class="text">{{login.name}}</span>
+                    <span class="detail">{{login.username}}</span>
+                </a>
             </div>
         </div>
     </div>
diff --git a/src/popup/less/components.less b/src/popup/less/components.less
index 17947142e6..792a0ad459 100644
--- a/src/popup/less/components.less
+++ b/src/popup/less/components.less
@@ -187,6 +187,13 @@
             background-color: transparent;
             padding: 10px 10px;
             color: @gray-light;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+
+            small {
+                float: right;
+            }
         }
     }