Ticket #7904: 7904.patch

_source/plugins/floatpanel/plugin.js

@@ -98 +98 @@
                         showBlock : function( name, offsetParent, corner, offsetX, offsetY )
                         {
                                 var panel = this._.panel,
-                                        block = panel.showBlock( name );
+                                        block = panel.showBlock( name ),
+                                        editor = this._.editor;
 
                                 this.allowBlur( false );
                                 isShowing = 1;
 
-                                // Record from where the focus is when open panel.
-                                this._.returnFocus = this._.editor.focusManager.hasFocus ? this._.editor : new CKEDITOR.dom.element( CKEDITOR.document.$.activeElement );
+                                // Record from where the focus is when open panel (#6247). If it is outside editor chrome, default back to editor (#7904).
+                                var returnFocus = editor.focusManager.hasFocus ? editor : new CKEDITOR.dom.element( CKEDITOR.document.$.activeElement );
+                                if ( returnFocus.type && !editor.container.equals( returnFocus ) && !editor.container.contains( returnFocus ) )
+                                        returnFocus = editor;
+                                this._.returnFocus = returnFocus;
 
 
                                 var element = this.element,

_source/plugins/format/plugin.js

@@ -63 +63 @@
                                         setTimeout( function()
                                         {
                                                 editor.fire( 'saveSnapshot' );
-                                                // At this point, focus might be lost (#7192).
-                                                CKEDITOR.env.ie && editor.focus();
                                         }, 0 );
                                 },