diff --git a/www/common/proxy-manager.js b/www/common/proxy-manager.js
index ca914b57a..420cf4101 100644
--- a/www/common/proxy-manager.js
+++ b/www/common/proxy-manager.js
@@ -82,9 +82,11 @@ define([
     // All occurences are returned, in drive or shared folders
     var findChannel = function (Env, channel) {
         var ret = [];
-        Env.user.userObject.findChannels([channel]).forEach(function (id) {
+        Env.user.userObject.findChannels([channel], true).forEach(function (id) {
+            var data = Env.user.proxy[UserObject.SHARED_FOLDERS][id] ||
+                        Env.user.userObject.getFileData(id);
             ret.push({
-                data: Env.user.userObject.getFileData(id),
+                data: data,
                 userObject: Env.user.userObject
             });
         });
diff --git a/www/common/userObject.js b/www/common/userObject.js
index 7795f09b3..5c987eb48 100644
--- a/www/common/userObject.js
+++ b/www/common/userObject.js
@@ -492,10 +492,13 @@ define([
         };
 
         // Get drive ids of files from their channel ids
-        exp.findChannels = function (channels) {
+        exp.findChannels = function (channels, includeSharedFolders) {
             var allFilesList = files[FILES_DATA];
-            return getFiles([FILES_DATA]).filter(function (k) {
-                var data = allFilesList[k];
+            var sfList = files[SHARED_FOLDERS];
+            var paths = [FILES_DATA];
+            if (includeSharedFolders) { paths.push(SHARED_FOLDERS); }
+            return getFiles(paths).filter(function (k) {
+                var data = allFilesList[k] || sfList[k] || {};
                 return channels.indexOf(data.channel) !== -1;
             });
         };