diff --git a/css-compiled/material.css b/css-compiled/material.css
index d5e0ec5b..96cab40e 100644
--- a/css-compiled/material.css
+++ b/css-compiled/material.css
@@ -1182,7 +1182,6 @@ fieldset[disabled] .form-control:focus,
 fieldset[disabled] .form-control.focus,
 .form-control-wrapper .form-control.focus,
 .form-control.focus {
-  height: 28px;
   padding: 0;
   float: none;
   border: 0;
@@ -1191,6 +1190,26 @@ fieldset[disabled] .form-control.focus,
   background: transparent;
   border-bottom: 1px solid #757575;
 }
+fieldset[disabled] .form-control:not(textarea),
+.form-control-wrapper .form-control:not(textarea),
+.form-control:not(textarea),
+fieldset[disabled] .form-control:focus:not(textarea),
+.form-control-wrapper .form-control:focus:not(textarea),
+.form-control:focus:not(textarea),
+fieldset[disabled] .form-control.focus:not(textarea),
+.form-control-wrapper .form-control.focus:not(textarea),
+.form-control.focus:not(textarea),
+fieldset[disabled] .form-control:not(select),
+.form-control-wrapper .form-control:not(select),
+.form-control:not(select),
+fieldset[disabled] .form-control:focus:not(select),
+.form-control-wrapper .form-control:focus:not(select),
+.form-control:focus:not(select),
+fieldset[disabled] .form-control.focus:not(select),
+.form-control-wrapper .form-control.focus:not(select),
+.form-control.focus:not(select) {
+  height: 28px;
+}
 fieldset[disabled] .form-control:disabled,
 .form-control-wrapper .form-control:disabled,
 .form-control:disabled,
diff --git a/less/inputs.less b/less/inputs.less
index b0ffa5f5..9948f7f9 100644
--- a/less/inputs.less
+++ b/less/inputs.less
@@ -2,7 +2,9 @@
 
 fieldset[disabled] .form-control, .form-control-wrapper .form-control, .form-control {
     &, &:focus, &.focus {
-        height: 28px;
+        &:not(textarea), &:not(select) {
+            height: 28px;
+        }
         padding: 0;
         float: none;
         border: 0;