diff --git a/package.json b/package.json
index 2fbef24..8fee9f6 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "@ckeditor/ckeditor5-list": "^35.3.1",
     "@ckeditor/ckeditor5-markdown-gfm": "^35.3.1",
     "@ckeditor/ckeditor5-mention": "^35.3.1",
-    "@ckeditor/ckeditor5-mermaid": "ckeditor/ckeditor5-mermaid#v0.0.2",
+    "@ckeditor/ckeditor5-mermaid": "ckeditor/ckeditor5-mermaid",
     "@ckeditor/ckeditor5-paragraph": "^35.3.1",
     "@ckeditor/ckeditor5-paste-from-office": "^35.3.1",
     "@ckeditor/ckeditor5-remove-format": "^35.3.1",
diff --git a/src/app/editor/setupmixin.js b/src/app/editor/setupmixin.js
index ff13991..a12a2ac 100644
--- a/src/app/editor/setupmixin.js
+++ b/src/app/editor/setupmixin.js
@@ -156,7 +156,7 @@ const SetupMixin = {
 		// Setup listeners for submit buttons.
 		{
 			this.domManipulator.addEventListener( 'button[type="submit"]', 'click', ( ev, button ) => {
-				if ( button.closest( 'form' ) === form ) {
+				if ( ( button.closest( 'form' ) === form ) || button.form === form ) {
 					// We want to play safe here an not allow the form to be posted if there is any error in the synchronization.
 					try {
 						syncOnSubmit( this );