diff --git a/less/forms.less b/less/forms.less
index 10a315da6a..fd44308b9f 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -227,6 +227,7 @@ input[type="search"],
 input[type="tel"],
 input[type="color"] {
   &.input-large {
+    min-height: @input-height-large;
     padding: @padding-large-vertical @padding-large-horizontal;
     font-size: @font-size-large;
     border-radius: @border-radius-large;
diff --git a/less/variables.less b/less/variables.less
index e71dd03e16..f918461264 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -129,8 +129,8 @@
 @input-color-placeholder:        @gray-light;
 
 @input-height-base:              (@line-height-computed + (@padding-base-vertical * 2) + 2);
-@input-height-large:             (@line-height-computed + (@padding-large-vertical * 2) + 2);
-@input-height-small:             (@line-height-computed + (@padding-small-vertical * 2) + 2);
+@input-height-large:             (ceil(@font-size-large * @line-height-base) + (@padding-large-vertical * 2) + 2);
+@input-height-small:             (ceil(@font-size-small * @line-height-base) + (@padding-small-vertical * 2) + 2);
 
 
 // Dropdowns