diff --git a/packages/ui-default/components/monaco/index.ts b/packages/ui-default/components/monaco/index.ts
index fb19fd9a4..dc5eced52 100644
--- a/packages/ui-default/components/monaco/index.ts
+++ b/packages/ui-default/components/monaco/index.ts
@@ -146,7 +146,9 @@ export function registerAction(
         monaco.KeyMod.WinCtrl | monaco.KeyCode.Enter,
       ],
       run: () => {
-        $(element).closest('form').submit();
+        const form = $(element).closest('form');
+        if (form.find('[data-default-submit]').length) form.find('[data-default-submit]').click();
+        else form.submit();
       },
     });
   }
diff --git a/packages/ui-default/templates/blog_edit.html b/packages/ui-default/templates/blog_edit.html
index ab1ad2bd1..c025c190e 100644
--- a/packages/ui-default/templates/blog_edit.html
+++ b/packages/ui-default/templates/blog_edit.html
@@ -29,7 +29,7 @@
                 extra_textarea_class:'auto-resize'
               }) }}
             <div class="row"><div class="columns">
-              <button name="operation" value="{{ 'update' if ddoc else 'create' }}" type="submit" class="rounded primary button">
+              <button name="operation" value="{{ 'update' if ddoc else 'create' }}" data-default-submit type="submit" class="rounded primary button">
                 {{ _('Update') if ddoc else _('Create') }} (Ctrl+Enter)
               </button>
             {% if ddoc and (handler.user.hasPriv(PRIV.PRIV_EDIT_SYSTEM) or handler.user.own(ddoc)) %}
diff --git a/packages/ui-default/templates/discussion_edit.html b/packages/ui-default/templates/discussion_edit.html
index 9c0e1800f..1dcb71251 100644
--- a/packages/ui-default/templates/discussion_edit.html
+++ b/packages/ui-default/templates/discussion_edit.html
@@ -8,7 +8,7 @@
           {% include "partials/discussion_edit_form.html" %}
             <div class="row"><div class="columns">
               <input type="hidden" name="csrfToken" value="{{ handler.csrfToken }}">
-              <button name="operation" value="update" type="submit" class="rounded primary button">
+              <button name="operation" value="update" data-default-submit type="submit" class="rounded primary button">
                 {{ _('Update') }} (Ctrl+Enter)
               </button>
             {% if handler.user.own(ddoc) or handler.user.hasPerm(perm.PERM_DELETE_DISCUSSION) %}