Index: /FCKeditor/trunk/_whatsnew.html
===================================================================
--- /FCKeditor/trunk/_whatsnew.html	(revision 1927)
+++ /FCKeditor/trunk/_whatsnew.html	(revision 1928)
@@ -50,4 +50,6 @@
 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2102">#2102</a>] Fixed FCKConfig.DocType
 			which stopped working in FCKeditor 2.6.</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>
Index: /FCKeditor/trunk/editor/_source/classes/fckdomrange.js
===================================================================
--- /FCKeditor/trunk/editor/_source/classes/fckdomrange.js	(revision 1927)
+++ /FCKeditor/trunk/editor/_source/classes/fckdomrange.js	(revision 1928)
@@ -460,5 +460,5 @@
 		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 ;
@@ -466,5 +466,5 @@
 			curStart = curStart.previousSibling ;
 		}
-		while ( curEnd && curEnd.nodeType == 3 )
+		while ( curEnd && addrEnd.nodeType == 3 )
 		{
 			bookmark.End[0] += curEnd.length ;