Merge branch 'master' into themes

2020-05-30 17:43:58 -05:00
parent a38560f914 61fcfdbc6e
commit 170b436705
1 changed files with 1 additions and 0 deletions
--- a/app/soapbox/features/compose/components/compose_form.js
+++ b/app/soapbox/features/compose/components/compose_form.js
@ -89,6 +89,7 @@ class ComposeForm extends ImmutablePureComponent {
  handleKeyDown = (e) => {
    if (e.keyCode === 13 && (e.ctrlKey || e.metaKey)) {
      this.handleSubmit();
+      e.preventDefault(); // Prevent bubbling to other ComposeForm instances
    }
  }