Ticket #35947: 35947.4.patch

src/wp-admin/css/customize-controls.css

@@ -428 +428 @@
 .in-sub-panel #customize-theme-controls > ul > .accordion-section {
         left: -300px;
         width: 300px;
+        height: 0;
 }
 
 .in-sub-panel #customize-theme-controls .accordion-section.current-panel {
         width: 100%;
+        height: auto;
 }
 
 #customize-theme-controls .control-section.current-panel {
@@ -459 +461 @@
         overflow-y: hidden;
 }
 
+.wp-full-overlay.section-open #customize-theme-controls > ul > .accordion-section {
+        height: 0;
+}
+
+.wp-full-overlay.section-open #customize-theme-controls > ul > .accordion-section.open {
+        height: auto;
+}
+
 .wp-full-overlay.section-open .wp-full-overlay-sidebar-content .accordion-section.open {
         visibility: visible;
 }

src/wp-admin/js/customize-controls.js

@@ -1367 +1367 @@
                                         accordionSection.addClass( 'current-panel' );
                                         overlay.addClass( 'in-sub-panel' );
                                         container.scrollTop( 0 );
-                                        if ( args.completeCallback ) {
-                                                args.completeCallback();
-                                        }
+                                        topPanel.attr( 'tabindex', '-1' );
+                                        backBtn.attr( 'tabindex', '0' );
+                                        panel._recalculateTopMargin();
+                                        _.delay( function() {
+                                                backBtn.focus();
+                                                if ( args.completeCallback ) {
+                                                        args.completeCallback();
+                                                }
+                                        }, 180 );
                                 } );
-                                topPanel.attr( 'tabindex', '-1' );
-                                backBtn.attr( 'tabindex', '0' );
-                                backBtn.focus();
-                                panel._recalculateTopMargin();
                         } else {
                                 siblings.removeClass( 'open' );
                                 accordionSection.removeClass( 'current-panel' );