diff --git a/apps/files_sharing/js/sharetabview.js b/apps/files_sharing/js/sharetabview.js
index 6836107306..9f6c71d192 100644
--- a/apps/files_sharing/js/sharetabview.js
+++ b/apps/files_sharing/js/sharetabview.js
@@ -54,7 +54,7 @@
 				}));
 
 				var attributes = {
-					itemType: 'file',
+					itemType: this.model.isDirectory() ? 'folder' : 'file',
 				   	itemSource: this.model.get('id'),
 					possiblePermissions: this.model.get('sharePermissions')
 				};
diff --git a/core/js/shareconfigmodel.js b/core/js/shareconfigmodel.js
index c6891154c9..16f7e2514d 100644
--- a/core/js/shareconfigmodel.js
+++ b/core/js/shareconfigmodel.js
@@ -37,7 +37,7 @@
 		 */
 		isPublicUploadEnabled: function() {
 			var publicUploadEnabled = $('#filestable').data('allow-public-upload');
-			return !_.isUndefined(publicUploadEnabled);
+			return publicUploadEnabled === 'yes';
 		},
 
 		/**
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index d95b3d8202..04ea41e5e0 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -29,7 +29,7 @@
 			'    <span class="icon-loading-small hidden"></span>' +
 			'</div>' +
 			'    {{#if publicUpload}}' +
-			'<div id="allowPublicUploadWrapper" class="hidden">' +
+			'<div id="allowPublicUploadWrapper">' +
 			'    <span class="icon-loading-small hidden"></span>' +
 			'    <input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload" {{{publicUploadChecked}}} />' +
 			'    <label for="sharingDialogAllowPublicUpload">{{publicUploadLabel}}</label>' +