Index: src/wp-includes/js/tinymce/plugins/wordpress/plugin.js
===================================================================
--- src/wp-includes/js/tinymce/plugins/wordpress/plugin.js	(revision 32816)
+++ src/wp-includes/js/tinymce/plugins/wordpress/plugin.js	(working copy)
@@ -667,14 +667,9 @@
 			}
 
 			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,8 +717,22 @@
 
 			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 || {};