diff --git a/scripts/material.js b/scripts/material.js
index 04be9b07..afa0d0e4 100644
--- a/scripts/material.js
+++ b/scripts/material.js
@@ -24,12 +24,15 @@ $(function (){
         }
     });
 
-    $(document).on("keyup", ".form-control", function() {
+    $(document).on("keyup change", ".form-control", function() {
         if ($(this).val() !== "") {
             $(this).removeClass("empty");
         } else {
             $(this).addClass("empty");
         }
     });
+    $(document).on("keydown", ".form-control", function() {
+        $(this).removeClass("empty");
+    });
 });