diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index 9ce8985f1fd28e381e9a45ae515c0648a714d302..ae2412f6a3b6fd027cfdc840efa8405705a5a717 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -62,11 +62,17 @@ $(document).ready(function() {
 
 	var file_upload_start = $('#file_upload_start');
 	file_upload_start.on('fileuploadadd', function(e, data) {
+		var fileDirectory = '';
+		if(typeof data.files[0].relativePath !== 'undefined') {
+			fileDirectory = data.files[0].relativePath;
+		}
+
 		// Add custom data to the upload handler
 		data.formData = {
 			requesttoken: $('#publicUploadRequestToken').val(),
 			dirToken: $('#dirToken').val(),
-			subdir: $('input#dir').val()
+			subdir: $('input#dir').val(),
+			file_directory: fileDirectory
 		};
 	});