diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index 4a184afdd..004474fbc 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -1341,6 +1341,7 @@ define([
                 all.push({
                     isShared: false,
                     name: name,
+                    teamId: s.id,
                     pathName: 'root',
                     children: s.manager.getTree()
                 });
diff --git a/www/common/proxy-manager.js b/www/common/proxy-manager.js
index 8479db57a..be1f20b55 100644
--- a/www/common/proxy-manager.js
+++ b/www/common/proxy-manager.js
@@ -1306,13 +1306,16 @@ define([
         var findShared = function (arr) {
             arr.forEach(function (el, i) {
                 if (typeof(el) === "object") { return findShared(el.children); }
-                if (!Env.folders[el]) { return; }
-                var d = getSharedFolderData(Env, el);
+                var sfArr = el.split('|');
+                var sfId = sfArr[0];
+                var sfPath = sfArr[1];
+                if (!Env.folders[sfId]) { return; }
+                var d = getSharedFolderData(Env, sfId);
                 arr[i] = {
                     isShared: true,
                     name: d.title,
-                    pathName: [el, Env.user.userObject.ROOT],
-                    children: Env.folders[el].userObject.getTree()
+                    pathName: [sfPath, Env.user.userObject.ROOT],
+                    children: Env.folders[sfId].userObject.getTree()
                 };
             });
         };
diff --git a/www/common/userObject.js b/www/common/userObject.js
index 05e55c7ae..4aafab343 100644
--- a/www/common/userObject.js
+++ b/www/common/userObject.js
@@ -776,7 +776,7 @@ define([
             root = root || files[ROOT];
             for (var e in root) {
                 if (isSharedFolder(root[e])) {
-                    tree.push(root[e]);
+                    tree.push(`${root[e]}|${e}`);
                 } else if (isFolder(root[e])) {
                     tree.push({
                         name: e,