diff --git a/addons/web_editor/static/src/js/wysiwyg/dialog.js b/addons/web_editor/static/src/js/wysiwyg/dialog.js
index e1321f478a2..b75e14bdf6d 100644
--- a/addons/web_editor/static/src/js/wysiwyg/dialog.js
+++ b/addons/web_editor/static/src/js/wysiwyg/dialog.js
@@ -36,7 +36,10 @@ var WysiwygDialog = Dialog.extend({
 
         var self = this;
         this.opened(function () {
-            self.$('input:visible:first').focus();
+            const selector = options.focusField
+                ? `input[name=${options.focusField}]` 
+                : 'input:visible:first';
+            self.$(selector).focus();
             self.$el.closest('.modal').addClass('o_web_editor_dialog');
             self.$el.closest('.modal').on('hidden.bs.modal', self.options.onClose);
         });
diff --git a/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js b/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js
index 03fb1a21bbb..856625f6458 100644
--- a/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js
+++ b/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js
@@ -1265,6 +1265,7 @@ const Wysiwyg = Widget.extend({
             const linkDialog = new weWidgets.LinkDialog(this, {
                 forceNewWindow: this.options.linkForceNewWindow,
                 wysiwyg: this,
+                focusField: link.innerHTML ? 'url' : '',
             }, this.$editable[0], {
                 needLabel: true
             }, undefined, link);