diff --git a/src/popup/app/vault/vaultAddSiteController.js b/src/popup/app/vault/vaultAddSiteController.js
index b1a98219c3..6d52833c38 100644
--- a/src/popup/app/vault/vaultAddSiteController.js
+++ b/src/popup/app/vault/vaultAddSiteController.js
@@ -1,7 +1,7 @@
 angular
     .module('bit.vault')
 
-    .controller('vaultAddSiteController', function ($scope, $state, siteService, cipherService, $q) {
+    .controller('vaultAddSiteController', function ($scope, $state, siteService, folderService, cipherService, $q) {
         $scope.site = {
             folderId: null
         };
@@ -9,6 +9,30 @@
         $('#name').focus();
         popupUtils.initListSectionItemListeners();
 
+        var promises = [];
+        var decFolders = [{
+            id: null,
+            name: '(none)'
+        }];
+
+        folderService.getAll(function (folders) {
+            for (var i = 1; i < folders.length; i++) {
+                decFolders.push({
+                    id: folders[i].id
+                });
+
+                var folderNamePromise = cipherService.decrypt(folders[i].name, i);
+                promises.push(folderNamePromise);
+                folderNamePromise.then(function (obj) {
+                    decFolders[obj.index].name = obj.val;
+                });
+            }
+
+            $q.all(promises).then(function () {
+                $scope.folders = decFolders;
+            });
+        });
+
         $scope.savePromise = null;
         $scope.save = function (model) {
             $scope.savePromise = cipherService.encryptSite(model).then(function (siteModel) {
diff --git a/src/popup/app/vault/vaultEditSiteController.js b/src/popup/app/vault/vaultEditSiteController.js
index 7cc7d2ff64..30d9d157ac 100644
--- a/src/popup/app/vault/vaultEditSiteController.js
+++ b/src/popup/app/vault/vaultEditSiteController.js
@@ -1,7 +1,7 @@
 angular
     .module('bit.vault')
 
-    .controller('vaultEditSiteController', function ($scope, $state, $stateParams, siteService, cipherService, $q) {
+    .controller('vaultEditSiteController', function ($scope, $state, $stateParams, siteService, folderService, cipherService, $q) {
         $scope.site = {
             folderId: null
         };
@@ -12,6 +12,30 @@
             });
         });
 
+        var promises = [];
+        var decFolders = [{
+            id: null,
+            name: '(none)'
+        }];
+
+        folderService.getAll(function (folders) {
+            for (var i = 1; i < folders.length; i++) {
+                decFolders.push({
+                    id: folders[i].id
+                });
+
+                var folderNamePromise = cipherService.decrypt(folders[i].name, i);
+                promises.push(folderNamePromise);
+                folderNamePromise.then(function (obj) {
+                    decFolders[obj.index].name = obj.val;
+                });
+            }
+
+            $q.all(promises).then(function () {
+                $scope.folders = decFolders;
+            });
+        });
+
         popupUtils.initListSectionItemListeners();
 
         $scope.savePromise = null;
diff --git a/src/popup/app/vault/views/vaultAddSite.html b/src/popup/app/vault/views/vaultAddSite.html
index 438a1fb9c8..4382a2c637 100644
--- a/src/popup/app/vault/views/vaultAddSite.html
+++ b/src/popup/app/vault/views/vaultAddSite.html
@@ -42,10 +42,8 @@
                 <div class="list-section-items">
                     <div class="list-section-item">
                         <label for="folder">Folder</label>
-                        <select id="folder" name="FolderId">
-                            <option>Blue</option>
-                            <option selected>Green</option>
-                            <option>Red</option>
+                        <select id="folder" name="FolderId" ng-model="site.folderId" bit-field>
+                            <option ng-repeat="folder in folders" value="{{folder.id}}">{{folder.name}}</option>
                         </select>
                     </div>
                     <div class="list-section-item list-section-item-checkbox">
diff --git a/src/popup/app/vault/views/vaultEditSite.html b/src/popup/app/vault/views/vaultEditSite.html
index 7048becb91..ff3350c331 100644
--- a/src/popup/app/vault/views/vaultEditSite.html
+++ b/src/popup/app/vault/views/vaultEditSite.html
@@ -42,10 +42,8 @@
                 <div class="list-section-items">
                     <div class="list-section-item">
                         <label for="folder">Folder</label>
-                        <select id="folder" name="FolderId">
-                            <option>Blue</option>
-                            <option selected>Green</option>
-                            <option>Red</option>
+                        <select id="folder" name="FolderId" ng-model="site.folderId" bit-field>
+                            <option ng-repeat="folder in folders" value="{{folder.id}}">{{folder.name}}</option>
                         </select>
                     </div>
                     <div class="list-section-item list-section-item-checkbox">