Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html	(revision 6113)
+++ /CKEditor/trunk/CHANGES.html	(revision 6114)
@@ -59,4 +59,5 @@
 		<li><a href="http://dev.ckeditor.com/ticket/4790">#4790</a> : Remove list with multiple items in enterBr doesn't preserve line-breaks.</li>
 		<li><a href="http://dev.ckeditor.com/ticket/6297">#6297</a> : Floated inline elements are no anymore acting in behavior of blocks.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6171">#6171</a> : [Firefox] Open rich combo scrolls host page to top when editor has vertical scrollbar.</li>
 	</ul>
 	<h3>
Index: /CKEditor/trunk/_source/plugins/floatpanel/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/floatpanel/plugin.js	(revision 6113)
+++ /CKEditor/trunk/_source/plugins/floatpanel/plugin.js	(revision 6114)
@@ -301,5 +301,6 @@
 						CKEDITOR.tools.setTimeout( function()
 						{
-							iframe.$.contentWindow.focus();
+							( new CKEDITOR.dom.document( iframe.$.contentWindow.document ) )
+								.getBody().focus();
 							// We need this get fired manually because of unfired focus() function.
 							this.allowBlur( true );