Index: src/wp-includes/js/tinymce/plugins/wordpress/plugin.js
===================================================================
--- src/wp-includes/js/tinymce/plugins/wordpress/plugin.js	(revision 39316)
+++ src/wp-includes/js/tinymce/plugins/wordpress/plugin.js	(working copy)
@@ -963,12 +963,9 @@
 			}
 
 			if ( args.toolbar ) {
-				if ( activeToolbar !== args.toolbar ) {
-					activeToolbar = args.toolbar;
-					activeToolbar.show();
-				} else {
-					activeToolbar.reposition();
-				}
+				activeToolbar = args.toolbar;
+				activeToolbar.reposition();
+				activeToolbar.show();
 			} else {
 				activeToolbar = false;
 			}
Index: src/wp-includes/js/tinymce/plugins/wpview/plugin.js
===================================================================
--- src/wp-includes/js/tinymce/plugins/wpview/plugin.js	(revision 39316)
+++ src/wp-includes/js/tinymce/plugins/wpview/plugin.js	(working copy)
@@ -190,7 +190,7 @@
 				] );
 
 				editor.on( 'wptoolbar', function( event ) {
-					if ( isView( event.element ) ) {
+					if ( ! event.collapsed && isView( event.element ) ) {
 						event.toolbar = toolbar;
 					}
 				} );
Index: tests/phpunit/tests/formatting/WPConvertToUTF8.php
===================================================================