diff --git a/src/filemanager.html b/src/filemanager.html
index 584a91e7b..07497c8b2 100644
--- a/src/filemanager.html
+++ b/src/filemanager.html
@@ -301,7 +301,7 @@
             <button class="btn btn-primary" ng-click="goDirectoryUp()" ng-disabled="cwd === '/'"><i class="fas fa-arrow-left"></i></button><button class="btn btn-primary" ng-click="refresh()"><i class="fas fa-sync-alt"></i></button>
           </div>
           <div class="btn-group path-parts" role="group">
-            <button class="btn btn-default" ng-disabled="cwd === '/'" ng-click="changeDirectory('/')"><i class="fas fa-home"></i> {{ rootDirLabel }} </button><button class="btn btn-default" ng-disabled="part.path === cwd" ng-click="changeDirectory(part.path)" ng-repeat="part in cwdParts">{{ part.name }}</button>
+            <button class="btn btn-default" ng-disabled="cwd === '/'" ng-click="changeDirectory('/')" ng-drop="drop($event, '/')"><i class="fas fa-home"></i> {{ rootDirLabel }} </button><button class="btn btn-default" ng-disabled="part.path === cwd" ng-click="changeDirectory(part.path)" ng-drop="drop($event, part.path)" ng-repeat="part in cwdParts">{{ part.name }}</button>
           </div>
           <div style="display: block;">
             <div class="btn-group">
diff --git a/src/js/filemanager.js b/src/js/filemanager.js
index be4d74339..2fe7ebe7b 100644
--- a/src/js/filemanager.js
+++ b/src/js/filemanager.js
@@ -202,7 +202,10 @@ app.controller('FileManagerController', ['$scope', '$translate', '$timeout', 'Cl
 
         if (!event.originalEvent.dataTransfer.items[0]) return;
 
-        var targetFolder = sanitize($scope.cwd + '/' + (entry && entry.isDirectory ? entry.fileName : ''));
+        var targetFolder;
+        if (typeof entry === 'string') targetFolder = sanitize(entry);
+        else targetFolder = sanitize($scope.cwd + '/' + (entry && entry.isDirectory ? entry.fileName : ''));
+
         var dataTransfer = event.originalEvent.dataTransfer;
 
         // check if we have internal drag'n'drop