Ticket #32604: 32604.6.patch

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

@@ -667 +667 @@
                         }
 
                         toolbar.on( 'show', function() {
-                                currentToolbar = this;
                                 this.reposition();
                         } );
 
-                        toolbar.on( 'hide', function() {
-                                currentToolbar = false;
-                        } );
-
                         toolbar.on( 'keydown', function( event ) {
                                 if ( event.keyCode === 27 ) {
                                         this.hide();
@@ -722 +717 @@
 
                         currentSelection = args.selection || args.element;
 
-                        currentToolbar && currentToolbar.hide();
-                        args.toolbar && args.toolbar.show();
+                        if ( currentToolbar ) {
+                                currentToolbar.hide();
+                        }
+
+                        if ( args.toolbar ) {
+                                currentToolbar = args.toolbar;
+                                currentToolbar.show();
+                        } else {
+                                currentToolbar = false;
+                        }
+                } );
+
+                editor.on( 'focus', function() {
+                        if ( currentToolbar ) {
+                                currentToolbar.show();
+                        }
                 } );
 
                 editor.wp = editor.wp || {};