Index: /CKEditor/trunk/_source/plugins/link/dialogs/anchor.js
===================================================================
--- /CKEditor/trunk/_source/plugins/link/dialogs/anchor.js	(revision 3731)
+++ /CKEditor/trunk/_source/plugins/link/dialogs/anchor.js	(revision 3732)
@@ -7,5 +7,5 @@
 {
 	// Function called in onShow to load selected element.
-	var loadElements = function( editor, selection, ranges, element )
+	var loadElements = function( editor, selection, element )
 	{
 		this.editMode = true;
@@ -39,4 +39,5 @@
 
 			// Set name.
+			element.removeAttribute( '_cke_saved_name' );
 			element.setAttribute( 'name', name );
 
@@ -44,11 +45,8 @@
 			var fakeElement = editor.createFakeElement( element, 'cke_anchor', 'anchor' );
 			if ( !this.editMode )
-			{
 				editor.insertElement( fakeElement );
-			}
 			else
 			{
 				fakeElement.replace( this.fakeObj );
-
 				editor.getSelection().selectElement( fakeElement );
 			}
@@ -62,20 +60,12 @@
 			this.editMode = false;
 
-			var editor = this.getParentEditor(),
-				selection = editor.getSelection(),
-				ranges = selection.getRanges();
-
-			if ( ranges.length == 1 )
+			var selection = editor.getSelection();
+			var element = selection.getSelectedElement();
+			if ( element && element.getAttribute( '_cke_real_element_type' ) && element.getAttribute( '_cke_real_element_type' ) == 'anchor' )
 			{
-				ranges[0].enlarge( CKEDITOR.ENLARGE_ELEMENT );
-				var rangeRoot = ranges[0].getCommonAncestor( true );
-				var element = rangeRoot.getAscendant( 'img', true );
-				if ( element && element.getAttribute( '_cke_real_element_type' ) && element.getAttribute( '_cke_real_element_type' ) == 'anchor' )
-				{
-					this.fakeObj = element;
-					element = editor.restoreRealElement( this.fakeObj );
-					loadElements.apply( this, [ editor, selection, ranges, element ] );
-					selection.selectElement( this.fakeObj );
-				}
+				this.fakeObj = element;
+				element = editor.restoreRealElement( this.fakeObj );
+				loadElements.apply( this, [ editor, selection, element ] );
+				selection.selectElement( this.fakeObj );
 			}
 			this.getContentElement( 'info', 'txtName' ).focus();