diff --git a/web_src/js/features/common-global.js b/web_src/js/features/common-global.js
index 46a80beb5..e6421b3a2 100644
--- a/web_src/js/features/common-global.js
+++ b/web_src/js/features/common-global.js
@@ -345,6 +345,8 @@ export function initGlobalButtons() {
     if (colorPickers.length > 0) {
       initCompColorPicker();
     }
+    // all non-"ok" buttons which do not have "type" should not submit the form, should not be triggered by "Enter"
+    $($(this).attr('data-modal')).find('form button:not(.ok):not([type])').attr('type', 'button');
   });
 
   $('.delete-post.button').on('click', function (e) {