From c16ad4e876b4aba119b2cf698eafaad9d6047d30 Mon Sep 17 00:00:00 2001
From: Robert Anderson <robert@noisysocks.com>
Date: Fri, 28 May 2021 15:19:02 +1000
Subject: [PATCH 1/4] Link to widgets.php instead of
 themes.php?page=gutenberg-widgets

---
 lib/init.php                                    | 17 +++++++++++++----
 .../src/components/sidebar/widget-areas.js      |  2 +-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/lib/init.php b/lib/init.php
index e22542766f87ed..bdabb0917271ff 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -30,7 +30,10 @@ function gutenberg_menu() {
 		'gutenberg'
 	);
 
-	if ( gutenberg_use_widgets_block_editor() ) {
+	if (
+		gutenberg_use_widgets_block_editor() &&
+		! function_exists( 'wp_use_widgets_block_editor' )
+	) {
 		add_theme_page(
 			__( 'Widgets', 'gutenberg' ),
 			__( 'Widgets', 'gutenberg' ),
@@ -113,7 +116,11 @@ function gutenberg_site_editor_menu() {
  * @param WP_Admin_Bar $wp_admin_bar Core class used to implement the Toolbar API.
  */
 function modify_admin_bar( $wp_admin_bar ) {
-	if ( gutenberg_use_widgets_block_editor() && $wp_admin_bar->get_node( 'widgets' ) !== null ) {
+	if (
+		gutenberg_use_widgets_block_editor() &&
+		! function_exists( 'wp_use_widgets_block_editor' ) &&
+		$wp_admin_bar->get_node( 'widgets' ) !== null
+	) {
 		$wp_admin_bar->add_menu(
 			array(
 				'id'   => 'widgets',
@@ -137,7 +144,10 @@ function modify_welcome_panel() {
 	ob_start();
 	wp_welcome_panel();
 	$welcome_panel = ob_get_clean();
-	if ( gutenberg_use_widgets_block_editor() ) {
+	if (
+		gutenberg_use_widgets_block_editor() &&
+		! function_exists( 'wp_use_widgets_block_editor' )
+	) {
 		echo str_replace(
 			admin_url( 'widgets.php' ),
 			admin_url( 'themes.php?page=gutenberg-widgets' ),
@@ -177,5 +187,4 @@ function register_site_icon_url( $response ) {
 
 add_filter( 'rest_index', 'register_site_icon_url' );
 
-add_theme_support( 'widgets-block-editor' );
 add_theme_support( 'block-templates' );
diff --git a/packages/edit-widgets/src/components/sidebar/widget-areas.js b/packages/edit-widgets/src/components/sidebar/widget-areas.js
index 781c644f13ba09..947254f3e115c3 100644
--- a/packages/edit-widgets/src/components/sidebar/widget-areas.js
+++ b/packages/edit-widgets/src/components/sidebar/widget-areas.js
@@ -59,7 +59,7 @@ export default function WidgetAreas( { selectedWidgetAreaId } ) {
 						<Button
 							href={ addQueryArgs( 'customize.php', {
 								'autofocus[panel]': 'widgets',
-								return: 'themes.php?page=gutenberg-widgets',
+								return: 'widgets.php',
 							} ) }
 							variant="tertiary"
 						>

From 4c57f3ad12ba8914d69824ecf82dc18e5cef87f2 Mon Sep 17 00:00:00 2001
From: Robert Anderson <robert@noisysocks.com>
Date: Mon, 31 May 2021 10:53:20 +1000
Subject: [PATCH 2/4] Use location.pathname for Customizer return URL

---
 packages/edit-widgets/src/components/sidebar/widget-areas.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/edit-widgets/src/components/sidebar/widget-areas.js b/packages/edit-widgets/src/components/sidebar/widget-areas.js
index 947254f3e115c3..ea3e5771116c6c 100644
--- a/packages/edit-widgets/src/components/sidebar/widget-areas.js
+++ b/packages/edit-widgets/src/components/sidebar/widget-areas.js
@@ -59,7 +59,7 @@ export default function WidgetAreas( { selectedWidgetAreaId } ) {
 						<Button
 							href={ addQueryArgs( 'customize.php', {
 								'autofocus[panel]': 'widgets',
-								return: 'widgets.php',
+								return: window.location.pathname,
 							} ) }
 							variant="tertiary"
 						>

From 6d1ada7be0a52b878314f89a4b4123efbd751742 Mon Sep 17 00:00:00 2001
From: Robert Anderson <robert@noisysocks.com>
Date: Mon, 31 May 2021 10:57:56 +1000
Subject: [PATCH 3/4] Add back missing add_theme_support()

---
 lib/init.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/init.php b/lib/init.php
index bdabb0917271ff..f721b8f773f441 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -187,4 +187,5 @@ function register_site_icon_url( $response ) {
 
 add_filter( 'rest_index', 'register_site_icon_url' );
 
+add_theme_support( 'widgets-block-editor' );
 add_theme_support( 'block-templates' );

From 99d8764cc81f1c3403d61f94f5305d3a3b66820b Mon Sep 17 00:00:00 2001
From: Robert Anderson <robert@noisysocks.com>
Date: Mon, 31 May 2021 14:02:36 +1000
Subject: [PATCH 4/4] Use widgets.php in Legacy Widget preview iframe

---
 packages/block-library/src/legacy-widget/edit/preview.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/block-library/src/legacy-widget/edit/preview.js b/packages/block-library/src/legacy-widget/edit/preview.js
index 639d7a6d0874e2..39e4d65a51cb45 100644
--- a/packages/block-library/src/legacy-widget/edit/preview.js
+++ b/packages/block-library/src/legacy-widget/edit/preview.js
@@ -78,8 +78,7 @@ export default function Preview( { idBase, instance, isVisible } ) {
 						// TODO: This chokes when the query param is too big.
 						// Ideally, we'd render a <ServerSideRender>. Maybe by
 						// rendering one in an iframe via a portal.
-						src={ addQueryArgs( 'themes.php', {
-							page: 'gutenberg-widgets',
+						src={ addQueryArgs( 'widgets.php', {
 							'legacy-widget-preview': {
 								idBase,
 								instance,