diff --git a/webroot/rsrc/js/core/behavior-form.js b/webroot/rsrc/js/core/behavior-form.js
--- a/webroot/rsrc/js/core/behavior-form.js
+++ b/webroot/rsrc/js/core/behavior-form.js
@@ -15,9 +15,9 @@
   });
 
 
-  JX.Stratcom.listen('keypress', ['tag:form', 'tag:textarea'], function(e) {
+  JX.Stratcom.listen('keydown', ['tag:form', 'tag:textarea'], function(e) {
     var raw = e.getRawEvent();
-    if (e.getSpecialKey() != 'return' || !raw.ctrlKey) {
+    if (!(e.getSpecialKey() === 'return' && (raw.ctrlKey || raw.metaKey))) {
       return;
     }