diff --git a/addons/web_editor/static/src/js/rte.js b/addons/web_editor/static/src/js/rte.js
index adbc7d4bd49..2940fcfa44f 100644
--- a/addons/web_editor/static/src/js/rte.js
+++ b/addons/web_editor/static/src/js/rte.js
@@ -330,10 +330,11 @@ var RTE = Widget.extend({
         });
 
         // start element observation
-        $(document).on('content_changed', '.o_editable', function (event) {
+        $(document).on('content_changed', '.o_editable', function (ev) {
             self.trigger('change', this);
-            if(!$(this).hasClass('o_dirty')) {
+            if (!ev.__isDirtyHandled) {
                 $(this).addClass('o_dirty');
+                ev.__isDirtyHandled = true;
             }
         });
 
@@ -366,6 +367,10 @@ var RTE = Widget.extend({
 
         var editables = history.getEditableHasUndo();
 
+        $('.o_editable')
+            .destroy()
+            .removeClass('o_editable o_is_inline_editable');
+
         var defs = $('.o_dirty')
             .removeAttr('contentEditable')
             .removeClass('o_dirty oe_carlos_danger o_is_inline_editable')