diff --git a/src/popup/app/settings/settingsFoldersController.js b/src/popup/app/settings/settingsFoldersController.js
index 9614180ce42..d80b7f0c21f 100644
--- a/src/popup/app/settings/settingsFoldersController.js
+++ b/src/popup/app/settings/settingsFoldersController.js
@@ -1,6 +1,15 @@
 angular
     .module('bit.settings')
 
-    .controller('settingsFoldersController', function ($scope) {
-        
+    .controller('settingsFoldersController', function ($scope, folderService, $q) {
+        $scope.loaded = false;
+
+        load();
+        function load() {
+            var foldersPromise = $q.when(folderService.getAllDecrypted());
+            foldersPromise.then(function (folders) {
+                $scope.loaded = true;
+                $scope.folders = folders;
+            });
+        }
     });
diff --git a/src/popup/app/settings/views/settings.html b/src/popup/app/settings/views/settings.html
index 4b61032673b..b390d71c62b 100644
--- a/src/popup/app/settings/views/settings.html
+++ b/src/popup/app/settings/views/settings.html
@@ -30,7 +30,7 @@
                 Manage
             </div>
             <div class="list-section-items">
-                <a class="list-section-item" href="">
+                <a class="list-section-item" ui-sref="folders({animation: 'in-slide-left'})">
                     Folders
                     <i class="fa fa-chevron-right fa-lg"></i>
                 </a>