Ticket #6640: 6640_2.patch

_source/plugins/floatpanel/plugin.js

@@ -60 +60 @@
                                 children : [],
                                 dir : editor.lang.dir
                         };
+
+                        editor.on( 'mode', function(){ this.hide(); }, this );
                 },
 
                 proto :

_source/plugins/richcombo/plugin.js

@@ -244 +244 @@
                                         if ( me.className )
                                                 this.element.getFirst().removeClass( me.className + '_panel' );
 
-                                        me.setState( CKEDITOR.TRISTATE_OFF );
+                                        me.setState( me.modes && me.modes[ editor.mode ] ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED );
 
                                         me._.on = 0;