- ' <a class="add-new-h2 hide-if-no-customize" href="%1$s">%2$s</a>',
- admin_url( 'customize.php?autofocus[panel]=widgets' ),
+ ' <a class="page-title-action hide-if-no-customize" href="%1$s">%2$s</a>',
+ esc_url( add_query_arg(
+ array(
+ array( 'autofocus' => array( 'panel' => 'widgets' ) ),
+ 'return' => urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) )
+ ),
+ admin_url( 'customize.php' )
+ ) ),