diff --git a/client/src/views/fields/wysiwyg.js b/client/src/views/fields/wysiwyg.js
index 5a38dad50c..a6cc87ce60 100644
--- a/client/src/views/fields/wysiwyg.js
+++ b/client/src/views/fields/wysiwyg.js
@@ -84,7 +84,12 @@ Espo.define('views/fields/wysiwyg', ['views/fields/text', 'lib!Summernote'], fun
             }.bind(this));
 
             this.once('remove', function () {
-                $('body > .tooltip').remove();
+                //$('body > .note-popover').remove();
+                this.$summernote.summernote('destroy');
+            });
+
+            this.on('inline-edit-off', function () {
+                this.$summernote.summernote('destroy');
             });
         },
 
diff --git a/client/src/views/record/detail.js b/client/src/views/record/detail.js
index 6c78503c5d..3b8bfb91a3 100644
--- a/client/src/views/record/detail.js
+++ b/client/src/views/record/detail.js
@@ -379,6 +379,9 @@ Espo.define('views/record/detail', ['views/record/base', 'view-record-helper'],
             for (var field in fields) {
                 var fieldView = fields[field];
                 if (fieldView.mode != 'detail') {
+                    if (fieldView.mode === 'edit') {
+                        fieldView.trigger('inline-edit-off');
+                    }
                     fieldView.setMode('detail');
                     fieldView.render();
                 }