Ticket #8361: 8361.patch

_source/plugins/link/dialogs/link.js

@@ -1331 +1331 @@
                         // Browser need the "href" fro copy/paste link to work. (#6641)
                         attributes.href = attributes[ 'data-cke-saved-href' ];
 
+                        // Create element if current selection is collapsed.
+                        var selection = editor.getSelection();
+
                         if ( !this._.selectedElement )
                         {
-                                // Create element if current selection is collapsed.
-                                var selection = editor.getSelection(),
-                                        ranges = selection.getRanges( true );
+                                var ranges = selection.getRanges( true );
                                 if ( ranges.length == 1 && ranges[0].collapsed )
                                 {
                                         // Short mailto link text view (#5736).
@@ -1372 +1373 @@
                                                 data.email.address : attributes[ 'data-cke-saved-href' ] );
                                 }
 
+                                selection.selectElement( element );
                                 delete this._.selectedElement;
                         }
                 },