diff --git a/src/app/vault/vaultController.js b/src/app/vault/vaultController.js
index 5ddd940b96e..8a92e72cfb4 100644
--- a/src/app/vault/vaultController.js
+++ b/src/app/vault/vaultController.js
@@ -193,13 +193,13 @@
             $scope.addCipher();
         });
 
-        $scope.addCipher = function (folder, favorite) {
+        $scope.addCipher = function (grouping, favorite) {
             var addModel = $uibModal.open({
                 animation: true,
                 templateUrl: 'app/vault/views/vaultAddCipher.html',
                 controller: 'vaultAddCipherController',
                 resolve: {
-                    selectedFolder: function () { return folder; },
+                    selectedFolder: function () { return grouping.folder ? grouping : null; },
                     checkedFavorite: function () { return favorite; }
                 }
             });
diff --git a/src/app/vault/views/vault.html b/src/app/vault/views/vault.html
index f918e5952b0..b82ad876b45 100644
--- a/src/app/vault/views/vault.html
+++ b/src/app/vault/views/vault.html
@@ -191,8 +191,13 @@
         </div>
         <div class="box-body" ng-class="{'no-padding': groupingCiphers.length}">
             <div ng-show="!groupingCiphers.length">
-                <p>No items in this collection/folder.</p>
-                <button type="button" ng-click="addCipher(grouping)" class="btn btn-default btn-flat">Add an Item</button>
+                <div ng-if="grouping.folder">
+                    <p>No items in this folder.</p>
+                    <button type="button" ng-click="addCipher(grouping)" class="btn btn-default btn-flat">Add an Item</button>
+                </div>
+                <div ng-if="!grouping.folder">
+                    <p>No items in this collection.</p>
+                </div>
             </div>
             <div class="table-responsive" ng-show="groupingCiphers.length">
                 <table class="table table-striped table-hover table-vmiddle">