diff --git a/common/static/common/js/discussion/views/discussion_thread_edit_view.js b/common/static/common/js/discussion/views/discussion_thread_edit_view.js
index ca1c2043e3..29378548ab 100644
--- a/common/static/common/js/discussion/views/discussion_thread_edit_view.js
+++ b/common/static/common/js/discussion/views/discussion_thread_edit_view.js
@@ -7,7 +7,10 @@
             tagName: 'form',
             events: {
                 submit: 'updateHandler',
-                'click .post-cancel': 'cancelHandler'
+                'click .post-cancel': 'cancelHandler',
+                'keypress input:not(.wmd-input)': function(event) {
+                    return DiscussionUtil.ignoreEnterKey(event);
+                }
             },
 
             attributes: {