[MERGE] forward port branch saas-12.4 up to cda4f3c308c

1 files changed, 6 insertions, 0 deletions

diff --git a/addons/web_editor/static/src/js/wysiwyg/plugin/history.js b/addons/web_editor/static/src/js/wysiwyg/plugin/history.js
index a60ab41523b..addf6383783 100644
--- a/addons/web_editor/static/src/js/wysiwyg/plugin/history.js
+++ b/addons/web_editor/static/src/js/wysiwyg/plugin/history.js
@@ -19,6 +19,12 @@ var HistoryPlugin = Plugins.history.extend({
             console.error(e);
         }
         this.context.invoke('editor.focus');
+        var newRange = this.context.invoke('editor.createRange');
+        if (!this.options.isEditableNode(newRange.sc)) {
+            var firstEditableSel = '[contenteditable="true"]:not(":hidden")';
+            var sc = this.$editable.find(firstEditableSel)[0];
+            this.context.invoke('editor.setRange', sc, 0, sc, 0).select();
+        }
     },
     /**
      * Clear the history.