diff --git a/www/common/userObject.js b/www/common/userObject.js
index 4cdcc0c46..39b55484a 100644
--- a/www/common/userObject.js
+++ b/www/common/userObject.js
@@ -519,26 +519,17 @@ define([
             var resFolders = [];
             var findFoldersRec = function (folder, path) {
                 for (var key in folder) {
-                    if (isFolder(folder[key])) {
-                        if (isSharedFolder(folder[key])) {
-//                            var name = getSharedFolderData(folder[key]).title || "";
-//                            if (name.toLowerCase().indexOf(lValue) !== -1) {
-//                                resFolders.push(path.concat([key, ROOT]));
-//                            }
-                            findFoldersRec(folder[key], path.concat([key, ROOT]));
-                        }
-                        else {
-                            if (key.toLowerCase().indexOf(lValue) !== -1) {
-                                resFolders.push({
-                                    id: null,
-                                    paths: [path.concat(key)],
-                                    data: {
-                                        title: key
-                                    }
-                                });
-                            }
-                            findFoldersRec(folder[key], path.concat(key));
+                    if (isFolder(folder[key]) && !isSharedFolder(folder[key])) {
+                        if (key.toLowerCase().indexOf(lValue) !== -1) {
+                            resFolders.push({
+                                id: null,
+                                paths: [path.concat(key)],
+                                data: {
+                                    title: key
+                                }
+                            });
                         }
+                        findFoldersRec(folder[key], path.concat(key));
                     }
                 }
             };
diff --git a/www/drive/inner.js b/www/drive/inner.js
index c0e67329b..9db0d92a9 100644
--- a/www/drive/inner.js
+++ b/www/drive/inner.js
@@ -2684,7 +2684,7 @@ define([
                     else {
                         $icon.append($folderIcon.clone());
                         $type.text(Messages.fm_folder);
-                        $('<a>').text(Messages.fm_openFolder || "Open folder").click(function (e) {
+                        $('<a>').text(Messages.fc_open).click(function (e) {
                             e.preventDefault();
                             APP.displayDirectory(path);
                         }).appendTo($openDir);