Ticket #39516: 39516.2.diff

src/wp-includes/js/media/views/attachments/browser.js

@@ -41 +41 @@
                 this.controller.on( 'toggle:upload:attachment', this.toggleUploader, this );
                 this.controller.on( 'edit:selection', this.editSelection );
                 this.createToolbar();
-                this.createUploader();
-                this.createAttachments();
-                if ( this.options.sidebar ) {
-                        this.createSidebar();
+                // if its open in wp-admin/upload.php show sidebar first
+                if ( 'library' === this.model.id ) {
+                        if ( this.options.sidebar ) {
+                                this.createSidebar();
+                        }
+                        this.createUploader();
+                        this.createAttachments();
+                } else {
+                        // if its open inside a modal (not in wp-admin/upload.php ) show uploader and attachments first
+                        this.createUploader();
+                        this.createAttachments();
+                        if ( this.options.sidebar ) {
+                                this.createSidebar();
+                        }
                 }
                 this.updateContent();
 

src/wp-includes/js/media-views.js

@@ -3772 +3772 @@
                 this.controller.on( 'toggle:upload:attachment', this.toggleUploader, this );
                 this.controller.on( 'edit:selection', this.editSelection );
                 this.createToolbar();
-                this.createUploader();
-                this.createAttachments();
-                if ( this.options.sidebar ) {
-                        this.createSidebar();
+                // if its open in wp-admin/upload.php show sidebar first
+                if ( 'library' === this.model.id ) {
+                        if ( this.options.sidebar ) {
+                                this.createSidebar();
+                        }
+                        this.createUploader();
+                        this.createAttachments();
+                } else {
+                        // if its open inside a modal (not in wp-admin/upload.php ) show uploader and attachments first
+                        this.createUploader();
+                        this.createAttachments();
+                        if ( this.options.sidebar ) {
+                                this.createSidebar();
+                        }
                 }
                 this.updateContent();