Index: _whatsnew.html
===================================================================
--- _whatsnew.html	(revision 1698)
+++ _whatsnew.html	(working copy)
@@ -67,6 +67,9 @@
 			Fixed XHTML source formatting errors in non-IE browsers.</li>
 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2000">#2000</a>] The #
 			character is now properly encoded in file names returned by the File Browser.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2016">#2016</a>] The Link
+			dialog now properly select the first field when opening it to modify mailto or anchor
+			links. This problem was also throwing an error in IE.</li>
 	</ul>
 	<h3>
 		Version 2.6 Beta 1</h3>
Index: editor/dialog/common/fck_dialog_common.js
===================================================================
--- editor/dialog/common/fck_dialog_common.js	(revision 1698)
+++ editor/dialog/common/fck_dialog_common.js	(working copy)
@@ -104,7 +104,10 @@
 {
 	var element = GetE( elementId ) ;
 	element.focus() ;
-	element.select() ;
+
+	// element.select may not be available for some fields (like <select>).
+	if ( element.select )
+		element.select() ;
 }
 
 // Functions used by text fields to accept numbers only.
Index: editor/dialog/fck_link/fck_link.js
===================================================================
--- editor/dialog/fck_link/fck_link.js	(revision 1698)
+++ editor/dialog/fck_link/fck_link.js	(working copy)
@@ -159,7 +159,22 @@
 
 	// Activate the "OK" button.
 	dialog.SetOkButton( true ) ;
-	SelectField( 'txtUrl' ) ;
+	
+	// Select the first field.
+	switch( GetE('cmbLinkType').value )
+	{
+		case 'url' :
+			SelectField( 'txtURL' ) ;
+			break ;
+		case 'email' :
+			SelectField( 'txtEMailAddress' ) ;
+			break ;
+		case 'anchor' : 
+			if ( GetE('divSelAnchor').style.display != 'none' )
+				SelectField( 'cmbAnchorName' ) ;
+			else
+				SelectField( 'cmbLinkType' ) ;
+	}
 }
 
 var bHasAnchors ;