diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index 4f61a7215..bb86c44f4 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -432,7 +432,6 @@ define([
                 var validate = nSecret.keys.validateKey;
                 var crypto = Crypto.createEncryptor(nSecret.keys);
                 Cryptpad.getHistoryRange({
-                    drive: cfg.isDrive,
                     channel: channel,
                     validateKey: validate,
                     lastKnownHash: data.lastKnownHash
diff --git a/www/common/userObject.js b/www/common/userObject.js
index c7aef75b1..8617d9379 100644
--- a/www/common/userObject.js
+++ b/www/common/userObject.js
@@ -260,7 +260,7 @@ define([
             var root = files[TRASH];
             var ret = [];
             var addFiles = function (el) {
-                if (isFile(el.element)) {
+                if (isFile(el.element) || isSharedFolder(el.element)) {
                     if(ret.indexOf(el.element) === -1) { ret.push(el.element); }
                 } else {
                     getFilesRecursively(el.element, ret);
diff --git a/www/drive/app-drive.less b/www/drive/app-drive.less
index 49b6c2ab3..91ea698d2 100644
--- a/www/drive/app-drive.less
+++ b/www/drive/app-drive.less
@@ -833,7 +833,6 @@
         }
 
         .cp-app-drive-path {
-            flex: 1;
             width: 100%;
             height: @variables_bar-height;
             line-height: @variables_bar-height;
@@ -843,7 +842,6 @@
             white-space: nowrap;
             display: flex;
             flex-flow: row-reverse;
-            justify-content: right;
             max-width: 100%;
             text-align: left;
             .cp-app-drive-path-element {
@@ -868,6 +866,10 @@
                 }
             }
         }
+
+        .cp-app-drive-toolbar-filler {
+            flex: 1;
+        }
     }
 }
 
diff --git a/www/drive/inner.js b/www/drive/inner.js
index 5227edf43..3bd09c30d 100644
--- a/www/drive/inner.js
+++ b/www/drive/inner.js
@@ -1567,8 +1567,8 @@ define([
 
                 var name = p;
 
-                var currentEl = manager.find(path.slice(0, idx+1));
-                if (manager.isSharedFolder(currentEl)) {
+                var currentEl = isVirtual ? undefined : manager.find(path.slice(0, idx+1));
+                if (currentEl && manager.isSharedFolder(currentEl)) {
                     name = manager.getSharedFolderData(currentEl).title;
                     skipNext = true;
                 }
@@ -2162,6 +2162,7 @@ define([
             $toolbar.html('');
             $('<div>', {'class': 'cp-app-drive-toolbar-leftside'}).appendTo($toolbar);
             $('<div>', {'class': 'cp-app-drive-path cp-unselectable'}).appendTo($toolbar);
+            $('<div>', {'class': 'cp-app-drive-toolbar-filler'}).appendTo($toolbar);
             var $rightside = $('<div>', {'class': 'cp-app-drive-toolbar-rightside'})
                 .appendTo($toolbar);
             var $hist = common.createButton('history', true, {histConfig: APP.histConfig});