diff --git a/app/assets/javascripts/validation.js b/app/assets/javascripts/validation.js
index 17574c0..5aafef8 100644
--- a/app/assets/javascripts/validation.js
+++ b/app/assets/javascripts/validation.js
@@ -1,4 +1,11 @@
 $(document).on('turbolinks:load', function() {
+  $(document).on('keypress', ':input:not(textarea):not([type=submit])', function(e) {
+    if (e.keyCode == 13) {
+      e.preventDefault();
+      e.stopPropagation();
+    }
+  });
+
   $('#submit-post').click(function(e) {
     var form = $(this).parents('form.form');