diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js
index 02539d377a..3a1bdeb7f7 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js
@@ -30,11 +30,6 @@ $(function () {
                     }
                 });
 
-                var contentEditorText = $("#ContentEditor")[0].innerText
-                    .replace('WritePreview', '')
-                    .replace('MarkdownWYSIWYG', '')
-                    .replace('W', '');
-
                 let updatedText = '';
                 if (widgetType != undefined) {
 
@@ -48,16 +43,8 @@ $(function () {
                     updatedText += "]";
                 }
 
-                if (contentEditorText == '\n\n\n') {
-                    //TODO fails event
-                    var fixedData = "<div>" + updatedText + "</div>";
-                    var innerHtml = $("#ContentEditor")[0].innerHTML;
-                    var replacedInnerHtml = innerHtml.replace('<div><br></div>', fixedData);
-                    $("#ContentEditor")[0].innerHTML = replacedInnerHtml;
-                }
-                else {
-                    $('.ProseMirror div').contents()[0].data = contentEditorText + updatedText;
-                }
+                $('#GeneratedWidgetText').val(updatedText);
+                $("#GeneratedWidgetText").trigger("click");
 
                 $('#addWidgetModal').modal('hide');
             });
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js
index 8dc2ab9eb4..2ea6cea91a 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js
@@ -6,6 +6,8 @@ $(function () {
     var $slug = $('#ViewModel_Slug');
     var $buttonSubmit = $('#button-page-create');
 
+    initAllEditors();
+
     var widgetModal = new abp.ModalManager({ viewUrl: abp.appPath + "CmsKit/Contents/AddWidgetModal", modalClass: "addWidgetModal" });
 
     var scriptEditor = CodeMirror.fromTextArea(document.getElementById("ViewModel_Script"), {
@@ -89,21 +91,20 @@ $(function () {
     var fileUploadUri = "/api/cms-kit-admin/media/page";
     var fileUriPrefix = "/api/cms-kit/media/";
 
-    initAllEditors();
 
     function initAllEditors() {
         $('.content-editor').each(function (i, item) {
             initEditor(item);
         });
     }
-
+    var editor;
     function initEditor(element) {
         var $editorContainer = $(element);
         var inputName = $editorContainer.data('input-id');
         var $editorInput = $('#' + inputName);
         var initialValue = $editorInput.val();
 
-        var editor = new toastui.Editor({
+        editor = new toastui.Editor({
             el: $editorContainer[0],
             usageStatistics: false,
             useCommandShortcut: true,
@@ -139,6 +140,10 @@ $(function () {
         });
     }
 
+    //$('.ProseMirror').on('click', function (e) {
+        
+    //});
+    
     function uploadFile(blob, callback, source) {
         var UPPY_OPTIONS = {
             endpoint: fileUploadUri,
@@ -171,6 +176,11 @@ $(function () {
         });
     }
 
+    $('#GeneratedWidgetText').click(function (e) {
+        var txt = $('#GeneratedWidgetText').val();
+        editor.insertText(txt);
+    });
+    
     function createAddWidgetButton() {
         //TODO add auth
         const button = document.createElement('button');