diff --git a/filemanager/package-lock.json b/filemanager/package-lock.json
index cea3acf18..197ab6f92 100644
--- a/filemanager/package-lock.json
+++ b/filemanager/package-lock.json
@@ -10,7 +10,7 @@
       "dependencies": {
         "combokeys": "^3.0.1",
         "filesize": "^10.0.7",
-        "pankow": "^0.1.1",
+        "pankow": "^0.1.2",
         "primeicons": "^6.0.1",
         "primevue": "^3.27.0",
         "superagent": "^8.0.9",
@@ -844,9 +844,9 @@
       }
     },
     "node_modules/pankow": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/pankow/-/pankow-0.1.1.tgz",
-      "integrity": "sha512-l06TNXKxmwBxCZGtOb7zzX2sdBx/12lU3IYBPD0EDTsuFmnR+a3A+OizaXxPqhFlClH1hmTXcMszGIiqxOzpbg==",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/pankow/-/pankow-0.1.2.tgz",
+      "integrity": "sha512-JrVaqnIKzH762AAjxAyRMW4T/Fm0DhN90aT57Geukb2g8WE7qhBlSOgcFCFu+4U9SGUSy3mIRJaq1K1jdjFXiA==",
       "dependencies": {
         "filesize": "^10.0.7",
         "monaco-editor": "^0.37.1",
diff --git a/filemanager/package.json b/filemanager/package.json
index 559692e40..b42e79f70 100644
--- a/filemanager/package.json
+++ b/filemanager/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "combokeys": "^3.0.1",
     "filesize": "^10.0.7",
-    "pankow": "^0.1.1",
+    "pankow": "^0.1.2",
     "primeicons": "^6.0.1",
     "primevue": "^3.27.0",
     "superagent": "^8.0.9",
diff --git a/filemanager/src/models/DirectoryModel.js b/filemanager/src/models/DirectoryModel.js
index 14580634d..9f7bf986b 100644
--- a/filemanager/src/models/DirectoryModel.js
+++ b/filemanager/src/models/DirectoryModel.js
@@ -47,7 +47,10 @@ export function createDirectoryModel(origin, accessToken, api) {
       return result.body.entries;
     },
     async upload(targetDir, file, progressHandler) {
-      await superagent.post(`${origin}/api/v1/${api}/files/${encodeURIComponent(sanitize(targetDir + '/' + file.name))}`)
+      // file may contain a file name or a file path + file name
+      const relativefilePath = (file.webkitRelativePath ? file.webkitRelativePath : file.name);
+
+      await superagent.post(`${origin}/api/v1/${api}/files/${encodeURIComponent(sanitize(targetDir + '/' + relativefilePath))}`)
         .query({ access_token: accessToken })
         .attach('file', file)
         .on('progress', progressHandler);
diff --git a/filemanager/src/views/Home.vue b/filemanager/src/views/Home.vue
index 5f22c99db..10108a4c1 100644
--- a/filemanager/src/views/Home.vue
+++ b/filemanager/src/views/Home.vue
@@ -59,6 +59,7 @@
             :new-folder-handler="onNewFolder"
             :upload-file-handler="onUploadFile"
             :upload-folder-handler="onUploadFolder"
+            :drop-handler="onDrop"
             :items="items"
             :clipboard="clipboard"
             :owners-model="ownersModel"
@@ -72,7 +73,6 @@
     <template #footer>
       <FileUploader
         ref="fileUploader"
-        :cwd="cwd"
         :upload-handler="uploadHandler"
         @finished="onUploadFinished"
       />
@@ -221,10 +221,10 @@ export default {
       this.newFolderDialog.visible = false;
     },
     onUploadFile() {
-      this.$refs.fileUploader.onUploadFile();
+      this.$refs.fileUploader.onUploadFile(this.cwd);
     },
     onUploadFolder() {
-      this.$refs.fileUploader.onUploadFolder();
+      this.$refs.fileUploader.onUploadFolder(this.cwd);
     },
     onUploadFinished() {
       this.loadCwd();
@@ -241,6 +241,39 @@ export default {
     onGoUp() {
       this.cwd = sanitize(this.cwd.split('/').slice(0, -1).join('/'));
     },
+    async onDrop(targetFolder, dataTransfer) {
+      const fullTargetFolder = sanitize(this.cwd + '/' + targetFolder);
+
+      // figure if a folder was dropped on a modern browser, in this case the first would have to be a directory
+      let folderItem;
+      try {
+          folderItem = dataTransfer.items[0].webkitGetAsEntry();
+          if (folderItem.isFile) return this.$refs.fileUploader.addFiles(dataTransfer.files, fullTargetFolder, false);
+      } catch (e) {
+          return this.$refs.fileUploader.addFiles(dataTransfer.files, fullTargetFolder, false);
+      }
+
+      // if we got here we have a folder drop and a modern browser
+      // now traverse the folder tree and create a file list
+      var that = this;
+      function traverseFileTree(item, path) {
+        if (item.isFile) {
+          item.file(function (file) {
+            that.$refs.fileUploader.addFiles([file], sanitize(`${that.cwd}/${targetFolder}`), false);
+          });
+        } else if (item.isDirectory) {
+          // Get folder contents
+          var dirReader = item.createReader();
+          dirReader.readEntries(function (entries) {
+            for (let i in entries) {
+              traverseFileTree(entries[i], item.name);
+            }
+          });
+        }
+      }
+
+      traverseFileTree(folderItem, '');
+    },
     onItemActivated(item) {
       if (!item) return;