Index: /FCKeditor/trunk/_whatsnew.html
===================================================================
--- /FCKeditor/trunk/_whatsnew.html	(revision 2158)
+++ /FCKeditor/trunk/_whatsnew.html	(revision 2159)
@@ -71,4 +71,6 @@
 			where the merge down command for tables cells does not work in IE for more than two
 			cells.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2320">#2320</a>] Fixed the issue
+			where the Find/Replace dialog scrolls the entire page.</li>
 	</ul>
 	<p>
Index: /FCKeditor/trunk/editor/_source/internals/fckdomtools.js
===================================================================
--- /FCKeditor/trunk/editor/_source/internals/fckdomtools.js	(revision 2158)
+++ /FCKeditor/trunk/editor/_source/internals/fckdomtools.js	(revision 2159)
@@ -990,16 +990,15 @@
 		if ( alignTop === false )
 		{
-			offset += element.offsetHeight ;
+			offset += element.offsetHeight || 0 ;
 
 			// Consider the margin in the scroll, which is ok for our current
 			// needs, but needs investigation if we will be using this function
 			// in other places.
-			offset += parseInt( this.GetCurrentElementStyle( element, 'marginBottom' ) || 0, 10 ) ;
+			offset += parseInt( this.GetCurrentElementStyle( element, 'marginBottom' ) || 0, 10 ) || 0 ;
 		}
 
 		// Appends the offsets for the entire element hierarchy.
-		offset += element.offsetTop ;
-		while ( ( element = element.offsetParent ) )
-			offset += element.offsetTop || 0 ;
+		var elementPosition = FCKTools.GetDocumentPosition( window, element ) ;
+		offset += elementPosition.y ;
 
 		// Scroll the window to the desired position, if not already visible.
Index: /FCKeditor/trunk/editor/dialog/fck_replace.html
===================================================================
--- /FCKeditor/trunk/editor/dialog/fck_replace.html	(revision 2158)
+++ /FCKeditor/trunk/editor/dialog/fck_replace.html	(revision 2159)
@@ -186,5 +186,5 @@
 		if ( focusNode.nodeType != 1 )
 			focusNode = focusNode.parentNode ;
-		focusNode.scrollIntoView( false ) ;
+		FCKDomTools.ScrollIntoView( focusNode, false ) ;
 		this._cursors = charRange._cursors ;
 	},