Ticket #40480: 40480.patch

src/wp-includes/js/mce-view.js

@@ -729 +729 @@
                                         $( node ).data( 'rendered', false );
                                         editor.dom.setAttrib( node, 'data-wpview-text', encodeURIComponent( text ) );
                                         wp.mce.views.createInstance( type, text, match.options, force ).render();
+
+                                        editor.selection.select( node );
+                                        editor.nodeChanged();
                                         editor.focus();
 
                                         return true;

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

@@ -992 +992 @@
 
                 function hide( event ) {
                         if ( activeToolbar ) {
-                                if ( activeToolbar.tempHide || event.type === 'hide' ) {
+                                if ( activeToolbar.tempHide || event.type === 'hide' || event.type === 'blur' ) {
                                         activeToolbar.hide();
                                         activeToolbar = false;
                                 } else if ( (