diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 649b5fe86..5d6a71b9d 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -4549,6 +4549,9 @@ define([
                     var rEl = manager.find(restorePath);
                     if (manager.isFile(rEl)) {
                         restoreName = manager.getTitle(rEl);
+                    } else if (manager.isSharedFolder(rEl)) {
+                        var sfData = manager.getSharedFolderData(rEl);
+                        restoreName = sfData.title || sfData.lastTitle || Messages.fm_deletedFolder;
                     } else {
                         restoreName = restorePath[1];
                     }
diff --git a/www/common/userObject.js b/www/common/userObject.js
index 680ef3d0b..ca716f25f 100644
--- a/www/common/userObject.js
+++ b/www/common/userObject.js
@@ -846,7 +846,8 @@ define([
         };
         exp.ownedInTrash = function (isOwned) {
             return getFiles([TRASH]).map(function (id) {
-                var data = exp.getFileData(id);
+                var data = isSharedFolder(id) ? files[SHARED_FOLDERS][id] : exp.getFileData(id);
+                if (!data) { return; }
                 return isOwned(data.owners) ? data.channel : undefined;
             }).filter(Boolean);
         };