diff --git a/public/app/features/datasources/partials/edit.html b/public/app/features/datasources/partials/edit.html
index c74ac22827f..3200c219796 100644
--- a/public/app/features/datasources/partials/edit.html
+++ b/public/app/features/datasources/partials/edit.html
@@ -15,7 +15,7 @@
 			<div class="gf-form">
 				<span class="gf-form-label width-7">Name</span>
 				<input class="gf-form-input max-width-21" type="text" ng-model="current.name" placeholder="My data source name" required>
-				<gf-popover offset="0px -85px">
+				<gf-popover offset="0px -95px">
 					The name is used when you select the data source in panels.
 					The <code>Default</code> data source is preselected in new
 					panels.
diff --git a/public/sass/components/_gf-form.scss b/public/sass/components/_gf-form.scss
index b18da724e76..dab8b4f302b 100644
--- a/public/sass/components/_gf-form.scss
+++ b/public/sass/components/_gf-form.scss
@@ -58,7 +58,7 @@ $gf-form-label-margin: 0.25rem;
   .checkbox-label {
     display: inline;
     cursor: pointer;
-    padding: $input-padding-y $input-padding-x;
+    padding: $input-padding-y 0.4rem;
     line-height: $input-line-height;
   }
 }