Ticket #27521: 27521.9.diff

src/wp-admin/js/theme.js

@@ -332 +332 @@
 
                 preview.render();
                 $( 'div.wrap' ).append( preview.el );
+
+                // Set focused theme to current element
+                themes.focusedTheme = this.$el;
+
+                // set focus in the preview
+                $( '.close-full-overlay' ).focus();
         }
 });
 
@@ -528 +534 @@
                         $( 'body' ).removeClass( 'theme-installer-active full-overlay-active' );
                 });
 
+                // Return focus to the theme div
+                if ( themes.focusedTheme ) {
+                        themes.focusedTheme.focus();
+                }
+
                 themes.router.navigate( themes.router.baseUrl( '' ) );
                 return false;
         },