diff --git a/js/auto-submit.js b/js/auto-submit.js
index a3e9aa42a07970d10998693e51f25cd1606ddd4a..6c551706e8af54c9e92f1c0d39f10907a9874b38 100644
--- a/js/auto-submit.js
+++ b/js/auto-submit.js
@@ -95,6 +95,15 @@ Drupal.behaviors.CToolsAutoSubmit = {
             }
           });
       });
+
+      //Disable submit on enter
+      $("input").keypress(function (evt) {
+        //Deterime where our character code is coming from within the event
+        var charCode = evt.charCode || evt.keyCode;
+        if (charCode  == 13) { //Enter key's keycode
+        return false;
+        }
+      });
   }
 }
 })(jQuery);