Ticket #38849: 38849.patch

src/wp-includes/js/tinymce/plugins/wordpress/plugin.js

@@ -963 +963 @@
                         }
 
                         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;
                         }

src/wp-includes/js/tinymce/plugins/wpview/plugin.js

@@ -190 +190 @@
                                 ] );
 
                                 editor.on( 'wptoolbar', function( event ) {
-                                        if ( isView( event.element ) ) {
+                                        if ( ! event.collapsed && isView( event.element ) ) {
                                                 event.toolbar = toolbar;
                                         }
                                 } );