diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -8,7 +8,7 @@
   'names' =>
   array(
     'core.pkg.css' => '1f7a202d',
-    'core.pkg.js' => '57d0e1c4',
+    'core.pkg.js' => '68839013',
     'darkconsole.pkg.js' => 'ca8671ce',
     'differential.pkg.css' => '331c38d9',
     'differential.pkg.js' => '11a5b750',
@@ -451,7 +451,7 @@
     'rsrc/js/core/behavior-error-log.js' => 'a5d7cf86',
     'rsrc/js/core/behavior-fancy-datepicker.js' => '5d584426',
     'rsrc/js/core/behavior-file-tree.js' => 'c8728c70',
-    'rsrc/js/core/behavior-form.js' => '27d4da3f',
+    'rsrc/js/core/behavior-form.js' => 'a9aaba0c',
     'rsrc/js/core/behavior-gesture.js' => 'fe2e0ba4',
     'rsrc/js/core/behavior-global-drag-and-drop.js' => '8fd76bab',
     'rsrc/js/core/behavior-history-install.js' => '7ee2b591',
@@ -532,7 +532,7 @@
     'javelin-behavior-aphront-basic-tokenizer' => 'b3a4b884',
     'javelin-behavior-aphront-crop' => 'b98fc918',
     'javelin-behavior-aphront-drag-and-drop-textarea' => '4a11ea9c',
-    'javelin-behavior-aphront-form-disable-on-submit' => '27d4da3f',
+    'javelin-behavior-aphront-form-disable-on-submit' => 'a9aaba0c',
     'javelin-behavior-aphront-more' => '9b9197be',
     'javelin-behavior-audio-source' => '59b251eb',
     'javelin-behavior-audit-preview' => 'be81801d',
@@ -988,12 +988,6 @@
       7 => 'javelin-typeahead-preloaded-source',
       8 => 'javelin-json',
     ),
-    '27d4da3f' =>
-    array(
-      0 => 'javelin-behavior',
-      1 => 'javelin-stratcom',
-      2 => 'javelin-dom',
-    ),
     '2a2dba85' =>
     array(
       0 => 'javelin-behavior',
@@ -1497,6 +1491,12 @@
       1 => 'javelin-dom',
       2 => 'javelin-stratcom',
     ),
+    'a9aaba0c' =>
+    array(
+      0 => 'javelin-behavior',
+      1 => 'javelin-stratcom',
+      2 => 'javelin-dom',
+    ),
     'ad7a69ca' =>
     array(
       0 => 'javelin-install',
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;
     }