Ticket #33228: 33228.patch

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

@@ -3041 +3041 @@
                         return;
                 }
 
-                var parent, topFocus,
+                var parent,
                         body = $( document.body ),
                         overlay = body.children( '.wp-full-overlay' ),
                         title = $( '#customize-info .panel-title.site-title' ),
@@ -3555 +3555 @@
 
                 api.trigger( 'ready' );
 
-                // Make sure left column gets focus
-                topFocus = closeBtn;
-                topFocus.focus();
-                setTimeout(function () {
-                        topFocus.focus();
-                }, 200);
-
         });
 
 })( wp, jQuery );

src/wp-includes/js/customize-loader.js

@@ -232 +232 @@
                  */
                 loaded: function() {
                         Loader.body.removeClass('customize-loading');
+                        // Make sure the overlay gets focus.
+                        Loader.iframe.contents().find( '.wp-full-overlay.expanded' ).attr( 'tabindex', 0 ).focus();
                 },
 
                 /**