2 files changed, 5 insertions, 4 deletions
diff --git a/addons/web_editor/static/src/js/wysiwyg/plugin/keyboard.js b/addons/web_editor/static/src/js/wysiwyg/plugin/keyboard.js
index ead54bb5f26..3db30752277 100644
--- a/addons/web_editor/static/src/js/wysiwyg/plugin/keyboard.js
+++ b/addons/web_editor/static/src/js/wysiwyg/plugin/keyboard.js
@@ -372,14 +372,14 @@ var KeyboardPlugin = AbstractPlugin.extend({
                 return $(n).hasClass('btn');
             });
 
-            // Move carret to the new button
-            range = this.context.invoke('editor.setRange', next.firstChild, 0);
-            range.select();
-
             // Force content in empty buttons, the carret can be moved there
             this.context.invoke('LinkPopover.hide');
             this.context.invoke('LinkPopover.fillEmptyLink', next, true);
             this.context.invoke('LinkPopover.fillEmptyLink', btn, true);
+
+            // Move carret to the new button
+            range = this.context.invoke('editor.setRange', next.firstChild, 0);
+            range.select();
         } else {
             range = this.context.invoke('editor.setRange', point.node, point.offset);
             range.normalize().select();
diff --git a/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js b/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js
index b8ff583c6fa..8cf1026158d 100644
--- a/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js
+++ b/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js
@@ -200,6 +200,7 @@ var Wysiwyg = Widget.extend({
         $editable.find('[style=""]').removeAttr('style');
         $editable.find('[title=""]').removeAttr('title');
         $editable.find('[alt=""]').removeAttr('alt');
+        $editable.find('[data-original-title=""]').removeAttr('data-original-title');
         $editable.find('a.o_image, span.fa, i.fa').html('');
         $editable.find('[aria-describedby]').removeAttr('aria-describedby').removeAttr('data-original-title');