- $submenu['themes.php'][6] = array( __( 'Customize' ), 'edit_theme_options', 'customize.php', 'hide-if-no-customize' );
- if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) )
+
+ $customize_url = add_query_arg( 'return', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), 'customize.php' );
+ $submenu['themes.php'][6] = array( __( 'Customize' ), 'customize', $customize_url, '', 'hide-if-no-customize' );
+ unset( $customize_url );
+ if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) ) {