diff --git a/dev/Styles/Admin/Plugin.less b/dev/Styles/Admin/Plugin.less
index 9cda5bf21..38fb8db36 100644
--- a/dev/Styles/Admin/Plugin.less
+++ b/dev/Styles/Admin/Plugin.less
@@ -23,4 +23,31 @@
 		width: 400px;
 		height: 70px;
 	}
+
+	.help-block {
+		cursor:help;
+		display: inline-block;
+		margin-left: 0.25em;
+		white-space: break-spaces;
+	}
+	.help-block::before {
+		content: 'ⓘ';
+	}
+	.help-block span {
+		background-color: #fff;
+		border: 1px solid #000;
+		border-radius: 3px;
+		display: none;
+		left: 2px;
+		padding: 4px 20px 4px 4px;
+		position: absolute;
+		right: 2px;
+		z-index: 1000;
+	}
+	.help-block:active span,
+	.help-block:focus span,
+	.help-block:hover span {
+		display: block;
+	}
+
 }
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPluginProperty.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPluginProperty.html
index 2c8333e05..567e641ba 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPluginProperty.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPluginProperty.html
@@ -1,4 +1,3 @@
-<div class="b-admin-plugin-property">
 	<label class="control-label" data-bind="text: Label, visible: 5 !== Type"></label>
 	<div class="controls">
 		<!-- ko if: 0 === Type -->
@@ -32,7 +31,7 @@
 			<input type="url"
 				data-bind="value: value, attr: {placeholder: placeholder}" />
 		<!-- /ko -->
-		<span class="help-block" data-bind="text: Desc, visible: '' !== Desc"></span>
+		<span tabindex="0" class="help-block" data-bind="visible: '' !== Desc">
+			<span data-bind="text: Desc"></span>
+		</span>
 	</div>
-	<br />
-</div>