Index: /FCKeditor/trunk/_whatsnew.html
===================================================================
--- /FCKeditor/trunk/_whatsnew.html	(revision 2144)
+++ /FCKeditor/trunk/_whatsnew.html	(revision 2145)
@@ -62,4 +62,7 @@
 			where the show blocks command loses the current selection from the view area when editing
 			a long document.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2322">#2322</a>] Fixed the issue
+			where the fit window command loses the current selection and scroll position in the
+			editing area.</li>
 	</ul>
 	<p>
Index: /FCKeditor/trunk/editor/_source/commandclasses/fckfitwindow.js
===================================================================
--- /FCKeditor/trunk/editor/_source/commandclasses/fckfitwindow.js	(revision 2144)
+++ /FCKeditor/trunk/editor/_source/commandclasses/fckfitwindow.js	(revision 2145)
@@ -37,4 +37,9 @@
 	var eBodyStyle			= eBody.style ;
 	var eParent ;
+
+	// Save the current selection and scroll position.
+	var oRange = new FCKDomRange( FCK.EditorWindow ) ;
+	oRange.MoveToSelection() ;
+	var oEditorScrollPos = FCKTools.GetScrollPosition( FCK.EditorWindow ) ;
 
 	// No original style properties known? Go fullscreen.
@@ -161,4 +166,8 @@
 
 	FCK.Focus() ;
+
+	// Restore the selection and scroll position of inside the document.
+	oRange.Select() ;
+	FCK.EditorWindow.scrollTo( oEditorScrollPos.X, oEditorScrollPos.Y ) ;
 }