Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html	(revision 7516)
+++ /CKEditor/trunk/CHANGES.html	(revision 7517)
@@ -61,4 +61,5 @@
 		<li><a href="http://dev.ckeditor.com/ticket/8945">#8945</a> : Fake elements now show alternative text on High Contrast mode.</li>
 		<li><a href="http://dev.ckeditor.com/ticket/8985">#8985</a> : Better handling of ENTER key events on dialogs.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8925">#8925</a> : [Firefox] Unexpected page scroll on large floating block when editor is re-focused.</li>
 	</ul>
 	<h3>
Index: /CKEditor/trunk/_source/plugins/wysiwygarea/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/wysiwygarea/plugin.js	(revision 7516)
+++ /CKEditor/trunk/_source/plugins/wysiwygarea/plugin.js	(revision 7517)
@@ -728,5 +728,8 @@
 								var doc = editor.document;
 
-								if ( editable && CKEDITOR.env.gecko && CKEDITOR.env.version >= 10900 )
+								// Applies to Fx 3.x.
+								if ( editable && CKEDITOR.env.gecko &&
+								     CKEDITOR.env.version > 10900 &&
+								     CKEDITOR.env.version < 20000 )
 									blinkCursor();
 								else if ( CKEDITOR.env.opera )