Ticket #39337: 39337.4.patch

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

@@ -428 +428 @@
                  */
                 replaceMarkers: function() {
                         this.getMarkers( function( editor, node ) {
+                                var selected = node === editor.selection.getNode();
                                 var $viewNode;
 
                                 if ( ! this.loader && $( node ).text() !== this.text ) {
@@ -440 +441 @@
                                 );
 
                                 editor.$( node ).replaceWith( $viewNode );
+
+                                if ( selected ) {
+                                        editor.selection.select( $viewNode[0] );
+
+                                        setTimeout( function() {
+                                                editor.selection.collapse();
+                                        } );
+                                }
                         } );
                 },