3 files changed, 20 insertions, 15 deletions
diff --git a/core/css/share.css b/core/css/share.css
index 73bad5c500d..6467cc0239c 100644
--- a/core/css/share.css
+++ b/core/css/share.css
@@ -23,29 +23,29 @@
 	}
 }
 
-#dropdown.shareDropDown .unshare.icon-loading-small {
+.shareTabView .unshare.icon-loading-small {
 	margin-top: 1px;
 }
 
-#dropdown.shareDropDown .shareWithLoading,
-#dropdown.shareDropDown .linkShare .icon-loading-small {
+.shareTabView .shareWithLoading,
+.shareTabView .linkShare .icon-loading-small {
 	display: inline-block !important;
 	padding-left: 10px;
 }
-#dropdown.shareDropDown .shareWithLoading {
+.shareTabView .shareWithLoading {
 	position: relative;
 	right: 70px;
 	top: 2px;
 }
-#dropdown.shareDropDown .icon-loading-small.hidden {
+.shareTabView .icon-loading-small.hidden {
 	display: none !important;
 }
 
-#dropdown .shareWithRemoteInfo {
+.shareTabView .shareWithRemoteInfo {
 	padding: 11px 20px;
 }
 
-#dropdown .avatar {
+.shareTabView .avatar {
 	margin-right: 8px;
 	display: inline-block;
 	overflow: hidden;
@@ -87,12 +87,12 @@
 #shareWithList li label{
 	margin-right: 8px;
 }
-#dropdown label {
+.shareTabView label {
 	font-weight:400;
 	white-space: nowrap;
 }
 
-#dropdown input[type="checkbox"] {
+.shareTabView input[type="checkbox"] {
 	margin:0 3px 0 8px;
 	vertical-align: middle;
 }
@@ -115,12 +115,18 @@ a.unshare {
 	padding-top:8px;
 }
 
-#dropdown input[type="text"],#dropdown input[type="password"] {
-	width: 86%;
+.shareTabView input[type="text"],
+.shareTabView input[type="password"],
+.shareTabView input[type="submit"] {
 	margin-left: 7px;
 }
 
-#dropdown form {
+.shareTabView input[type="text"],
+.shareTabView input[type="password"] {
+	width: 86%;
+}
+
+.shareTabView form {
 	font-size: 100%;
 	margin-left: 0;
 	margin-right: 0;
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index 2c7914b2545..ab591b9c6e8 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -32,7 +32,7 @@
 			'<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>' +
+			'<label for="sharingDialogAllowPublicUpload">{{publicUploadLabel}}</label>' +
 			'</div>' +
 			'    {{/if}}' +
 			'    {{#if mailPublicNotificationEnabled}}' +
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 8c390ee5450..2b61dab3ceb 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -20,9 +20,8 @@
 		'<div class="oneline">' +
 		'    <input id="shareWith" type="text" placeholder="{{sharePlaceholder}}" />' +
 		'    <span class="shareWithLoading icon-loading-small hidden"></span>'+
-		'</div>' +
-			// FIXME: find a good position for remoteShareInfo
 		'{{{remoteShareInfo}}}' +
+		'</div>' +
 		'{{/if}}' +
 		'<div class="shareeListView"></div>' +
 		'<div class="linkShareView"></div>' +