Ticket #42530: 42530.diff

src/wp-admin/js/editor.js

@@ -635 +635 @@
                                 selectionPosition = TinyMCEContentAreaTop + elementTop,
                                 visibleAreaHeight = windowHeight - ( edToolsHeight + toolbarHeight );
 
+                        if ( selectionPosition < visibleAreaHeight ) {
+                                return;
+                        }
                         /**
                          * The minimum scroll height should be to the top of the editor, to offer a consistent
                          * experience.
@@ -854 +857 @@
                         if ( textArea.focus ) {
                                 // focus and scroll to the position
                                 setTimeout( function() {
+                                        textArea.setSelectionRange( start, end );
                                         if ( textArea.blur ) {
                                                 // defocus before focusing
                                                 textArea.blur();
                                         }
                                         textArea.focus();
                                 }, 100 );
-
-                                textArea.focus();
                         }
-
-                        textArea.setSelectionRange( start, end );
                 }
 
                 // Restore the selection when the editor is initialized. Needed when the Text editor is the default.