diff --git a/src/lib/input/input-container.scss b/src/lib/input/input-container.scss
index 95bd0d5cae5..0154daac663 100644
--- a/src/lib/input/input-container.scss
+++ b/src/lib/input/input-container.scss
@@ -202,7 +202,7 @@ textarea.mat-input-element {
 
   .mat-input-ripple {
     position: absolute;
-    height: $mat-input-underline-height * 2;
+    height: $mat-input-underline-height;
     top: 0;
     left: 0;
     width: 100%;
@@ -211,6 +211,10 @@ textarea.mat-input-element {
     visibility: hidden;
     transition: background-color $swift-ease-in-duration $swift-ease-in-timing-function;
 
+    .mat-focused & {
+      height: $mat-input-underline-height * 2;
+    }
+
     .mat-focused &,
     .mat-input-invalid & {
       visibility: visible;