1 files changed, 14 insertions, 5 deletions
diff --git a/js/app/Run.js b/js/app/Run.js
index dbea1641b..d12bea6c7 100644
--- a/js/app/Run.js
+++ b/js/app/Run.js
@@ -61,16 +61,25 @@ app.run(function ($rootScope, $location, $http, $q, $interval, Loading,
         activeFeedDeferred.resolve();
     });
 
+    var feedDeferred = $q.defer();
+    var folders, feeds;
+    $http.get(BASE_URL + '/feeds').success(function (data) {
+        feeds = data;
+        feedDeferred.resolve();
+    });
+
     var folderDeferred = $q.defer();
     $http.get(BASE_URL + '/folders').success(function (data) {
-        Publisher.publishAll(data);
+        folders = data;
         folderDeferred.resolve();
     });
 
-    var feedDeferred = $q.defer();
-    $http.get(BASE_URL + '/feeds').success(function (data) {
-        Publisher.publishAll(data);
-        feedDeferred.resolve();
+    $q.all([
+        feedDeferred.promise,
+        folderDeferred.promise
+    ]).then(function () {
+        Publisher.publishAll(feeds);
+        Publisher.publishAll(folders);
     });
 
     // disable loading if all initial requests finished