diff --git a/src/main/java/org/vaadin/tinymce/TinyMce.java b/src/main/java/org/vaadin/tinymce/TinyMce.java
index dddaf74..2a0da8f 100644
--- a/src/main/java/org/vaadin/tinymce/TinyMce.java
+++ b/src/main/java/org/vaadin/tinymce/TinyMce.java
@@ -194,6 +194,7 @@ protected void onAttach(AttachEvent attachEvent) {
         if (attachEvent.isInitialAttach())
             injectTinyMceScript();
         initConnector();
+        saveOnClose();
     }
 
     @Override
@@ -221,6 +222,11 @@ rawConfig, getElement(), ta, config, currentValue,
                     .then(res -> initialContentSent = true);
         });
     }
+    
+    private void saveOnClose(){
+        runBeforeClientResponse(ui -> {
+            getElement().callJsFunction("$connector.saveOnClose");});
+    }
 
     void runBeforeClientResponse(SerializableConsumer<UI> command) {
         getElement().getNode().runWhenAttached(ui -> ui
diff --git a/src/main/resources/META-INF/resources/frontend/tinymceConnector.js b/src/main/resources/META-INF/resources/frontend/tinymceConnector.js
index 298949b..35085f0 100644
--- a/src/main/resources/META-INF/resources/frontend/tinymceConnector.js
+++ b/src/main/resources/META-INF/resources/frontend/tinymceConnector.js
@@ -2,7 +2,17 @@ window.Vaadin.Flow.tinymceConnector = {
     initLazy: function (customConfig, c, ta, options, initialContent, enabled) {
 		var currentValue = ta.innerHTML;
         var readonlyTimeout;
-        var changeMode = 'change';
+        var changeMode;
+        
+        const beforeUnloadHandler = (event) => {
+          const blurEvent = new Event("tblur");
+          c.dispatchEvent(blurEvent);
+          const changeEvent = new Event("tchange");
+          changeEvent.htmlString = c.$connector.editor.getContent();
+          c.dispatchEvent(changeEvent);
+        };
+
+        window.removeEventListener("beforeunload", beforeUnloadHandler);
  
         // Check whether the connector was already initialized
         if (c.$connector) {
@@ -11,6 +21,7 @@ window.Vaadin.Flow.tinymceConnector = {
             c.$connector.editor.remove();
         } else {
           // Init connector at first visit
+          changeMode = 'change';
           c.$connector = {
           
             setEditorContent : function(html) {
@@ -52,6 +63,10 @@ window.Vaadin.Flow.tinymceConnector = {
                     parent = parent.parentElement;
                 }
                 return inDialog;
+            },
+            
+            saveOnClose : function() {
+                window.addEventListener("beforeunload", beforeUnloadHandler);
             }
           };
         }