diff --git a/server/project.js b/server/project.js
index 0c94a59..b7c180f 100644
--- a/server/project.js
+++ b/server/project.js
@@ -149,8 +149,11 @@ exports.list = function(noCache) {
             path: "",
             children: {}
         }
+        var encountered = 0, added = 0;
         dive(process.cwd(), { recursive: true, all: true, directories: true },
         function(err, path) {
+            encountered++;
+
             if (err) {
                 console.warn(err);
                 return
@@ -167,9 +170,11 @@ exports.list = function(noCache) {
                 } else {
                     addToListCache(path + "/.")
                 }
+
+                if (++added == encountered) {
+                    ee.emit('success', listCache);
+                }
             })
-        }, function() {
-            ee.emit('success', listCache)
         })
     } else {
         process.nextTick(function() {