diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index 4cb0503bb..b53b7cae9 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -65,6 +65,13 @@ define([
         Store.getSharedFolder = function (clientId, id, cb) {
             if (store.manager.folders[id]) {
                 return void cb(store.manager.folders[id].proxy);
+            } else {
+                var shared = Util.find(store.proxy, ['drive', UserObject.SHARED_FOLDERS]) || {};
+                if (shared[id]) {
+                    return void Store.loadSharedFolder(id, shared[id], function () {
+                        cb(store.manager.folders[id].proxy);
+                    });
+                }
             }
             cb({});
         };
@@ -1165,7 +1172,7 @@ define([
         };
 
         // SHARED FOLDERS
-        var loadSharedFolder = function (id, data, cb) {
+        var loadSharedFolder = Store.loadSharedFolder = function (id, data, cb) {
             var parsed = Hash.parsePadUrl(data.href);
             var secret = Hash.getSecrets('drive', parsed.hash, data.password);
             var owners = data.owners;
diff --git a/www/common/proxy-manager.js b/www/common/proxy-manager.js
index 5d3ce14cd..3a6028ab1 100644
--- a/www/common/proxy-manager.js
+++ b/www/common/proxy-manager.js
@@ -370,7 +370,7 @@ define([
             cb(obj);
         });
     };
-    // Add a folder/subfolder
+    // Add a shared folder
     var _addSharedFolder = function (Env, data, cb) {
         data = data || {};
         var resolved = _resolvePath(Env, data.path);