Index: /CKEditor/branches/features/aria/_source/plugins/find/dialogs/find.js
===================================================================
--- /CKEditor/branches/features/aria/_source/plugins/find/dialogs/find.js	(revision 5074)
+++ /CKEditor/branches/features/aria/_source/plugins/find/dialogs/find.js	(revision 5075)
@@ -813,9 +813,4 @@
 				// Establish initial searching start position.
 				finder.searchRange = getSearchRange();
-
-				if ( startupPage == 'replace' )
-					this.getContentElement( 'replace', 'txtFindReplace' ).focus();
-				else
-					this.getContentElement( 'find', 'txtFindFind' ).focus();
 			},
 			onHide : function()
@@ -831,4 +826,11 @@
 				// Clear current session before dialog close
 				delete finder.matchRange;
+			},
+			onFocus : function()
+			{
+				if ( startupPage == 'replace' )
+					return this.getContentElement( 'replace', 'txtFindReplace' );
+				else
+					return this.getContentElement( 'find', 'txtFindFind' );
 			}
 		};