diff --git a/templates/standalone/tooltip.lucius b/templates/standalone/tooltip.lucius
index d85415d97..0a2154768 100644
--- a/templates/standalone/tooltip.lucius
+++ b/templates/standalone/tooltip.lucius
@@ -1,6 +1,8 @@
 .js-tooltip {
   position: relative;
   display: inline-block;
+  height: 1.5rem;
+  vertical-align: -0.375rem;
 
   &:hover .tooltip__content {
     display: inline-block;
diff --git a/templates/widgets/form.hamlet b/templates/widgets/form.hamlet
index 2c0cfc9b8..79c2178a6 100644
--- a/templates/widgets/form.hamlet
+++ b/templates/widgets/form.hamlet
@@ -6,10 +6,11 @@ $case formLayout
       $# TODO: add class 'form-group--submit' if this is the submit-button view
       <div .form-group :fvRequired view:.form-group--required :not $ fvRequired view:.form-group--optional :isJust $ fvErrors view:.form-group--has-error>
         $if not (Blaze.null $ fvLabel view)
-          <label .form-group__label for=#{fvId view}>#{fvLabel view}
+          <label .form-group__label for=#{fvId view}>
+            #{fvLabel view}
+            $maybe tooltip <- fvTooltip view
+              <div .js-tooltip>
+                <div .tooltip__handle>
+                <div .tooltip__content>^{tooltip}
         <div .form-group__input>
           ^{fvInput view}
-          $maybe tooltip <- fvTooltip view
-            <div .js-tooltip>
-              <div .tooltip__handle>
-              <div .tooltip__content>^{tooltip}