From 19eac64cff822f7bb703820462a0b731ecee6faa Mon Sep 17 00:00:00 2001
From: Lena Morita <lena@jaguchi.com>
Date: Wed, 5 Aug 2026 02:32:33 +0900
Subject: [PATCH 1/3] Add ThemeProvider to widgets editor for admin color
 schemes.

---
 package-lock.json                             |  1 +
 packages/edit-widgets/CHANGELOG.md            |  4 +++
 packages/edit-widgets/package.json            |  1 +
 .../src/components/layout/index.js            | 34 ++++++++++++-------
 4 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 43d3a60b0c0b69..b241b13865fa94 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -51815,6 +51815,7 @@
 			"version": "6.51.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
+				"@wordpress/admin-ui": "file:../admin-ui",
 				"@wordpress/api-fetch": "file:../api-fetch",
 				"@wordpress/base-styles": "file:../base-styles",
 				"@wordpress/block-editor": "file:../block-editor",
diff --git a/packages/edit-widgets/CHANGELOG.md b/packages/edit-widgets/CHANGELOG.md
index f518bb83246c4c..8ea51a5c466560 100644
--- a/packages/edit-widgets/CHANGELOG.md
+++ b/packages/edit-widgets/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Enhancements
+
+-   Wrap the widgets editor layout in `ThemeProvider`, seeded with the active admin color scheme primary color.
+
 ## 6.51.0 (2026-07-14)
 
 ### Enhancements
diff --git a/packages/edit-widgets/package.json b/packages/edit-widgets/package.json
index a64cfb55ee6841..7c4fe5179edb5c 100644
--- a/packages/edit-widgets/package.json
+++ b/packages/edit-widgets/package.json
@@ -47,6 +47,7 @@
 		]
 	},
 	"dependencies": {
+		"@wordpress/admin-ui": "file:../admin-ui",
 		"@wordpress/api-fetch": "file:../api-fetch",
 		"@wordpress/base-styles": "file:../base-styles",
 		"@wordpress/block-editor": "file:../block-editor",
diff --git a/packages/edit-widgets/src/components/layout/index.js b/packages/edit-widgets/src/components/layout/index.js
index aff7f46085eb63..13a74dac29416a 100644
--- a/packages/edit-widgets/src/components/layout/index.js
+++ b/packages/edit-widgets/src/components/layout/index.js
@@ -1,11 +1,14 @@
 /**
  * WordPress dependencies
  */
+import { getAdminThemeColors } from '@wordpress/admin-ui';
 import { __, sprintf } from '@wordpress/i18n';
+import { useMemo } from '@wordpress/element';
 import { useDispatch } from '@wordpress/data';
 import { PluginArea } from '@wordpress/plugins';
 import { store as noticesStore } from '@wordpress/notices';
 import { __unstableUseNavigateRegions as useNavigateRegions } from '@wordpress/components';
+import { ThemeProvider } from '@wordpress/theme';
 
 /**
  * Internal dependencies
@@ -33,21 +36,26 @@ function Layout( { blockEditorSettings } ) {
 	}
 
 	const navigateRegionsProps = useNavigateRegions();
+	const adminPrimary = useMemo( () => getAdminThemeColors().primary, [] );
 
 	return (
-		<ErrorBoundary>
-			<div { ...navigateRegionsProps }>
-				<WidgetAreasBlockEditorProvider
-					blockEditorSettings={ blockEditorSettings }
-				>
-					<Interface blockEditorSettings={ blockEditorSettings } />
-					<Sidebar />
-					<PluginArea onError={ onPluginAreaError } />
-					<UnsavedChangesWarning />
-					<WelcomeGuide />
-				</WidgetAreasBlockEditorProvider>
-			</div>
-		</ErrorBoundary>
+		<ThemeProvider isRoot color={ { primary: adminPrimary } }>
+			<ErrorBoundary>
+				<div { ...navigateRegionsProps }>
+					<WidgetAreasBlockEditorProvider
+						blockEditorSettings={ blockEditorSettings }
+					>
+						<Interface
+							blockEditorSettings={ blockEditorSettings }
+						/>
+						<Sidebar />
+						<PluginArea onError={ onPluginAreaError } />
+						<UnsavedChangesWarning />
+						<WelcomeGuide />
+					</WidgetAreasBlockEditorProvider>
+				</div>
+			</ErrorBoundary>
+		</ThemeProvider>
 	);
 }
 

From 6867c9a9bc2be6429d4c2bdd16287bd3f9294bc6 Mon Sep 17 00:00:00 2001
From: Lena Morita <lena@jaguchi.com>
Date: Wed, 5 Aug 2026 02:34:01 +0900
Subject: [PATCH 2/3] Add changelog

---
 packages/edit-widgets/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/edit-widgets/CHANGELOG.md b/packages/edit-widgets/CHANGELOG.md
index 8ea51a5c466560..940cf12c707b2c 100644
--- a/packages/edit-widgets/CHANGELOG.md
+++ b/packages/edit-widgets/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 ### Enhancements
 
--   Wrap the widgets editor layout in `ThemeProvider`, seeded with the active admin color scheme primary color.
+-   Wrap the widgets editor layout in `ThemeProvider`, seeded with the active admin color scheme primary color ([#81173](https://github.com/WordPress/gutenberg/pull/81173)).
 
 ## 6.51.0 (2026-07-14)
 

From aafc045bf37f796ae302e0d0d875e0a0f27c1fbe Mon Sep 17 00:00:00 2001
From: Lena Morita <lena@jaguchi.com>
Date: Wed, 5 Aug 2026 02:47:01 +0900
Subject: [PATCH 3/3] Fix up

---
 packages/edit-widgets/src/components/layout/index.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/packages/edit-widgets/src/components/layout/index.js b/packages/edit-widgets/src/components/layout/index.js
index 13a74dac29416a..3f093ab9c0304f 100644
--- a/packages/edit-widgets/src/components/layout/index.js
+++ b/packages/edit-widgets/src/components/layout/index.js
@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import { getAdminThemeColors } from '@wordpress/admin-ui';
 import { __, sprintf } from '@wordpress/i18n';
 import { useMemo } from '@wordpress/element';
@@ -9,10 +6,6 @@ import { PluginArea } from '@wordpress/plugins';
 import { store as noticesStore } from '@wordpress/notices';
 import { __unstableUseNavigateRegions as useNavigateRegions } from '@wordpress/components';
 import { ThemeProvider } from '@wordpress/theme';
-
-/**
- * Internal dependencies
- */
 import ErrorBoundary from '../error-boundary';
 import WidgetAreasBlockEditorProvider from '../widget-areas-block-editor-provider';
 import Sidebar from '../sidebar';