Index: _whatsnew.html
===================================================================
--- _whatsnew.html	(revision 1849)
+++ _whatsnew.html	(working copy)
@@ -42,7 +42,8 @@
 	<p>
 		Fixed Bugs:</p>
 	<ul>
-		<li></li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2039">#2039</a>] Fixed the locking up issue
+			in the Find/Replace dialog.</li>
 	</ul>
 	<h3>
 		Version 2.6 (SVN)</h3>
Index: editor/_source/classes/fckdomrange.js
===================================================================
--- editor/_source/classes/fckdomrange.js	(revision 1849)
+++ editor/_source/classes/fckdomrange.js	(working copy)
@@ -459,13 +459,13 @@
 		// Also note that the node that we use for "address base" would change during backtracking.
 		var addrStart = this._Range.startContainer ;
 		var addrEnd = this._Range.endContainer ;
-		while ( curStart && curStart.nodeType == 3 )
+		while ( curStart && addrStart.nodeType == 3 )
 		{
 			bookmark.Start[0] += curStart.length ;
 			addrStart = curStart ;
 			curStart = curStart.previousSibling ;
 		}
-		while ( curEnd && curEnd.nodeType == 3 )
+		while ( curEnd && addrEnd.nodeType == 3 )
 		{
 			bookmark.End[0] += curEnd.length ;
 			addrEnd = curEnd ;