diff --git a/src/material/input/_input-theme.scss b/src/material/input/_input-theme.scss
index 027f0005354a..57afcd9b8c24 100644
--- a/src/material/input/_input-theme.scss
+++ b/src/material/input/_input-theme.scss
@@ -45,11 +45,11 @@
     }
   }
 
-  .mat-accent .mat-input-element {
+  .mat-form-field.mat-accent .mat-input-element {
     caret-color: mat-color($accent, text);
   }
 
-  .mat-warn .mat-input-element,
+  .mat-form-field.mat-warn .mat-input-element,
   .mat-form-field-invalid .mat-input-element {
     caret-color: mat-color($warn, text);
   }