Index: _whatsnew.html
===================================================================
--- _whatsnew.html	(revision 1708)
+++ _whatsnew.html	(working copy)
@@ -73,6 +73,9 @@
 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1055">#1055</a>] Added logic
 			to override JavaScript errors occuring inside the editing frame due to user added
 			JavaScript code.</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>
 		Version 2.6 Beta 1</h3>
Index: editor/plugins/placeholder/fck_placeholder.html
===================================================================
--- editor/plugins/placeholder/fck_placeholder.html	(revision 1707)
+++ editor/plugins/placeholder/fck_placeholder.html	(working copy)
@@ -26,6 +26,7 @@
 		<title>Placeholder Properties</title>
 		<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">
 
 var dialog = window.parent ;
@@ -42,6 +43,9 @@
 
 	// Show the "Ok" button.
 	dialog.SetOkButton( true ) ;
+
+	// Select text field on load.
+	SelectField( 'txtName' ) ;
 }
 
 var eSelected = dialog.Selection.GetSelectedElement() ;