Index: _source/plugins/maximize/plugin.js
===================================================================
--- _source/plugins/maximize/plugin.js	(revision 3418)
+++ _source/plugins/maximize/plugin.js	(working copy)
@@ -249,10 +249,11 @@
 					command : 'maximize'
 				} );
 
+			// Restore the command state after mode change.
 			editor.on( 'mode', function()
 				{
 					editor.getCommand( 'maximize' ).setState( savedState );
-				} );
+				}, null, null, 100 );
 		}
 	} );
 })();
Index: _source/plugins/showblocks/plugin.js
===================================================================
--- _source/plugins/showblocks/plugin.js	(revision 3418)
+++ _source/plugins/showblocks/plugin.js	(working copy)
@@ -121,13 +121,12 @@
 					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 );
 		}
 	});
 } )();