Index: /FCKeditor/trunk/_whatsnew.html
===================================================================
--- /FCKeditor/trunk/_whatsnew.html	(revision 1724)
+++ /FCKeditor/trunk/_whatsnew.html	(revision 1725)
@@ -88,4 +88,7 @@
 			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>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2021">#2021</a>] The caret
+			will no longer remain behind in the editing area when the placeholder dialog is
+			opened.</li>
 	</ul>
 	<h3>
Index: /FCKeditor/trunk/editor/plugins/placeholder/fck_placeholder.html
===================================================================
--- /FCKeditor/trunk/editor/plugins/placeholder/fck_placeholder.html	(revision 1724)
+++ /FCKeditor/trunk/editor/plugins/placeholder/fck_placeholder.html	(revision 1725)
@@ -27,4 +27,5 @@
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 		<meta content="noindex, nofollow" name="robots">
+		<script src="../../dialog/common/fck_dialog_common.js" type="text/javascript"></script>
 		<script language="javascript">
 
@@ -43,4 +44,7 @@
 	// Show the "Ok" button.
 	dialog.SetOkButton( true ) ;
+
+	// Select text field on load.
+	SelectField( 'txtName' ) ;
 }