diff --git a/www/common/userObject.js b/www/common/userObject.js
index 79d5dc3f0..cd1ca032a 100644
--- a/www/common/userObject.js
+++ b/www/common/userObject.js
@@ -446,6 +446,7 @@ define([
             res.forEach(function (l) {
                 //var paths = findFile(l);
                 ret.push({
+                    id: l,
                     paths: findFile(l),
                     data: exp.getFileData(l)
                 });
diff --git a/www/drive/main.js b/www/drive/main.js
index 0b137c23d..3b703c899 100644
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -1198,6 +1198,13 @@ define([
                 draggable: true,
                 'class': 'element-row'
             });
+            if (!isFolder && Array.isArray(APP.selectedFiles)) {
+                var idx = APP.selectedFiles.indexOf(element);
+                if (idx !== -1) {
+                    $element.addClass('selected');
+                    APP.selectedFiles.splice(idx, 1);
+                }
+            }
             if (isFolder) {
                 addFolderData(element, key, $element);
             } else {
@@ -1751,6 +1758,13 @@ define([
                     'class': 'file-element element element-row' + roClass,
                     draggable: draggable
                 });
+                if (Array.isArray(APP.selectedFiles)) {
+                    var idx = APP.selectedFiles.indexOf(id);
+                    if (idx !== -1) {
+                        $element.addClass('selected');
+                        APP.selectedFiles.splice(idx, 1);
+                    }
+                }
                 addFileData(id, $element);
                 $element.prepend($icon).dblclick(function () {
                     openFile(id);
@@ -1864,6 +1878,7 @@ define([
                             e.preventDefault();
                             if (filesOp.isInTrashRoot(parentPath)) { parentPath = [TRASH]; }
                             else { parentPath.pop(); }
+                            APP.selectedFiles = [r.id];
                             module.displayDirectory(parentPath);
                         });
                     }