Ticket #3437: 3437_2.patch

_source/plugins/maximize/plugin.js

@@ -249 +249 @@
                                         command : 'maximize'
                                 } );
 
+                        // Restore the command state after mode change.
                         editor.on( 'mode', function()
                                 {
                                         editor.getCommand( 'maximize' ).setState( savedState );
-                                } );
+                                }, null, null, 100 );
                 }
         } );
 })();

_source/plugins/showblocks/plugin.js

@@ -121 +121 @@
                                         command : 'showblocks'
                                 } );
 
-                        editor.on( 'contentDom', function()
+                        // Restore the command state after mode change.
+                        editor.on( 'mode', function()
                         {
-                                // Restore show blocks state after mode switches.
-                                command.setState( CKEDITOR.TRISTATE_OFF );
-                                if ( this._.showBlocks )
+                                if ( editor.mode === 'wysiwyg' && this._.showBlocks )
                                         command.exec();
-                        } );
+                        }, null, null, 100 );
                 }
         });
 } )();