diff --git a/scripts/material.js b/scripts/material.js
index ad219f97..c9323cff 100644
--- a/scripts/material.js
+++ b/scripts/material.js
@@ -12,8 +12,8 @@ $(function (){
         $(".radio > label > input").not(".bs-material").addClass("bs-material").after("<span class=circle></span><span class=check></span>");
 
         // Add elements for material inputs
-        $("input.form-control, textarea.form-control, select.form-control").not(".bs-material").each( function() {
-            $(this).addClass("bs-material");
+        $("input.form-control, textarea.form-control, select.form-control").each( function() {
+            if ($(this).is(".bs-material")) { return; }
             $(this).wrap("<div class=form-control-wrapper></div>");
             $(this).after("<span class=material-input></span>");
             if ($(this).hasClass("floating-label")) {