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');
 
diff --git a/addons/web_editor/static/tests/wysiwyg_keyboard_tests.js b/addons/web_editor/static/tests/wysiwyg_keyboard_tests.js
index 37727c691bd..14f06ec2e9d 100644
--- a/addons/web_editor/static/tests/wysiwyg_keyboard_tests.js
+++ b/addons/web_editor/static/tests/wysiwyg_keyboard_tests.js
@@ -1665,9 +1665,9 @@ var keyboardTestsEnter = [{
             key: 'a',
         }],
         test: {
-            content: "<div class=\"unbreakable\"><a class=\"btn\" href=\"#\">&#8203;a&#8203;</a><a class=\"btn\" href=\"#\">dom to edit</a></div>",
+            content: "<div class=\"unbreakable\"><a class=\"btn\" href=\"#\">Label</a><a class=\"btn\" href=\"#\">&#8203;adom to edit&#8203;</a></div>",
             // split button has no text so the placeholder text is selected then replaced by 'a'
-            start: "a:contents()[0]->2",
+            start: "a:eq(1):contents()[0]->2",
         },
     },
     {
@@ -1680,9 +1680,9 @@ var keyboardTestsEnter = [{
             key: 'a',
         }],
         test: {
-            content: "<div class=\"unbreakable\"><a class=\"btn\" href=\"#\">&#8203;a&#8203;</a><a class=\"btn\" href=\"#\">dom to edit</a></div>",
+            content: "<div class=\"unbreakable\"><a class=\"btn\" href=\"#\">Label</a><a class=\"btn\" href=\"#\">&#8203;adom to edit&#8203;</a></div>",
             // split button has no text so the placeholder text is selected then replaced by 'a'
-            start: "a:contents()[0]->2",
+            start: "a:eq(1):contents()[0]->2",
         },
     },
     {
@@ -1767,9 +1767,9 @@ var keyboardTestsEnter = [{
             key: 'a',
         }],
         test: {
-            content: "<div class=\"unbreakable\"><a class=\"btn\" href=\"#\">&#8203;a&#8203;</a><a class=\"btn\" href=\"#\">Label</a></div>",
+            content: "<div class=\"unbreakable\"><a class=\"btn\" href=\"#\">Label</a><a class=\"btn\" href=\"#\">&#8203;a&#8203;</a></div>",
             // Removing all text in a link replaces that text with "Label"
-            start: "a:contents()[0]->2",
+            start: "a:eq(1):contents()[0]->2",
         },
     },
     {
@@ -1781,9 +1781,8 @@ var keyboardTestsEnter = [{
             key: 'ENTER',
         }],
         test: {
-            content: "<div class=\"unbreakable\"><a class=\"btn\" href=\"#\">&#8203;Label&#8203;</a><a class=\"btn\" href=\"#\">ot to edit</a></div>",
-            start: "a:contents()[0]->1",
-            end: "a:contents()[0]->6",
+            content: "<div class=\"unbreakable\"><a class=\"btn\" href=\"#\">Label</a><a class=\"btn\" href=\"#\">&#8203;ot to edit&#8203;</a></div>",
+            start: "a:eq(1):contents()[0]->1",
         },
     },
 ];