diff --git a/src/components/input/demoErrors/index.html b/src/components/input/demoErrors/index.html
index 38bc3d6df6d..bd427e71a8a 100644
--- a/src/components/input/demoErrors/index.html
+++ b/src/components/input/demoErrors/index.html
@@ -35,7 +35,7 @@
       <md-input-container class="md-block">
         <label>Hourly Rate (USD)</label>
         <input required type="number" step="any" name="rate" ng-model="project.rate" min="800"
-               max="4999" ng-pattern="/^1234$/" md-maxlength="20" />
+               max="4999" ng-pattern="/^1234$/" />
 
         <div ng-messages="projectForm.rate.$error" multiple md-auto-hide="false">
           <div ng-message="required">
diff --git a/src/components/input/input.scss b/src/components/input/input.scss
index b2f103b2f0c..f2a2dd635bc 100644
--- a/src/components/input/input.scss
+++ b/src/components/input/input.scss
@@ -250,8 +250,18 @@ md-input-container {
     }
   }
 
+  // Note: This is a workaround to fix an ng-enter flicker bug
+  .md-auto-hide {
+    .md-input-message-animation {
+      &:not(.ng-animate) {
+        opacity: 0;
+        margin-top: -100px;
+      }
+    }
+  }
+
   .md-input-message-animation {
-    &.ng-enter, &:not(.ng-animate) {
+    &.ng-enter {
       opacity: 0;
       margin-top: -100px;
     }