diff --git a/frappe/core/doctype/domain_settings/domain_settings.js b/frappe/core/doctype/domain_settings/domain_settings.js
index 39cd8d5dd9..1750573111 100644
--- a/frappe/core/doctype/domain_settings/domain_settings.js
+++ b/frappe/core/doctype/domain_settings/domain_settings.js
@@ -42,9 +42,11 @@ frappe.DomainsEditor = frappe.CheckboxEditor.extend({
 
 	get_template: function() {
 		return `
-			<div class="user-role" data-domain="{{item}}">
-				<input type="checkbox" style="margin-top:0px;">
-				{{__(item)}}
+			<div class="checkbox" data-domain="{{item}}">
+				<label>
+				<input type="checkbox">
+				<span class="label-area small">{{ __(item) }}</span>
+				</label>
 			</div>
 		`;
 	},
diff --git a/frappe/public/css/desk.css b/frappe/public/css/desk.css
index 8b1dacd667..61163533c5 100644
--- a/frappe/public/css/desk.css
+++ b/frappe/public/css/desk.css
@@ -398,9 +398,9 @@ fieldset[disabled] .form-control {
   width: 100%;
 }
 .awesomplete > ul {
-  z-index: 1041;
+  z-index: 1041 !important;
   transition: none;
-  background: #fff;
+  background-color: #fff;
   max-height: 200px;
   overflow-y: auto;
   overflow-x: hidden;
diff --git a/frappe/public/js/frappe/form/templates/set_sharing.html b/frappe/public/js/frappe/form/templates/set_sharing.html
index 33e19c0139..617cb07848 100644
--- a/frappe/public/js/frappe/form/templates/set_sharing.html
+++ b/frappe/public/js/frappe/form/templates/set_sharing.html
@@ -49,9 +49,19 @@
         <div class="col-xs-2"><input type="checkbox" class="add-share-share" name="share"></div>
     </div>
     <p>
-        <button class="btn btn-primary btn-add-share">{%= __("Add") %}</button>
+        <button class="btn btn-primary btn-add-share">{{ __("Add") }}</button>
     </p>
-    <input type="checkbox" class="add-share-notify" name="notify" checked> {%= __("Notify via email")%}
-
-    {% } %}
-</div>
+    <div class="row">
+		<div class="col-xs-6"></div>
+		<div class="col-xs-6">
+		<div class="checkbox">
+			<label><span class="input-area">
+				<input type="checkbox" class="add-share-notify"
+					name="notify"></span>
+				<span class="label-area small">{{ __("Notify by email") }}</span>
+			</label>
+		</div>
+		</div>
+	</div>
+	{% endif %}
+</div>
\ No newline at end of file
diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index 786c05461b..0275a7695a 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -195,9 +195,9 @@ textarea.form-control {
 	width: 100%;
 
 	&> ul {
-		z-index: 1041;
+		z-index: 1041 !important;
 		transition: none;
-		background: #fff;
+		background-color: #fff;
 		max-height: 200px;
 		overflow-y: auto;
 		overflow-x: hidden;