Ticket #33258: 33258.3.diff

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

@@ -73 +73 @@
                         } else {
                                 focusContainer = construct.container;
                         }
-                        focusContainer.find( ':focusable:first' ).focus();
-                        focusContainer[0].scrollIntoView( true );
+
+                        // Note that we can't use :focusable due to a jQuery UI issue. See: https://github.com/jquery/jquery-ui/pull/1583
+                        focusContainer.find( 'input, select, textarea, button, object, a[href], [tabindex]' ).filter( ':visible' ).first().focus();
                 };
                 if ( params.completeCallback ) {
                         completeCallback = params.completeCallback;

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

@@ -1270 +1270 @@
 
                         if ( expanded ) {
 
-                                if ( 'undefined' != typeof api.section( self.section ) && ! api.section( self.section ).expanded() ) {
+                                if ( self.section() && api.section( self.section() ) ) {
                                         self.expandControlSection();
                                 }