@@ -6,7 +6,7 @@
 
 -   Avoid intercepting esbuild virtual modules, preserve root custom-property priorities on cleanup, and reject non-finite RGB seed channels while treating missing (`none`) RGB channels as zero. ([#83355](https://github.com/WordPress/gutenberg/pull/83355))
 -   Make JavaScript token fallback transforms syntax-aware, preserve tagged-template values and source maps, and support Vite query-string module IDs. Use the TypeScript loader for `.ts`, `.mts`, and `.cts` files handled by the esbuild plugin, including files whose token values are unchanged. ([#83356](https://github.com/WordPress/gutenberg/pull/83356))
--   Preserve Lightning CSS `from global` references when injecting design token fallbacks ([#83359](https://github.com/WordPress/gutenberg/pull/83359)).
+-   Preserve Lightning CSS `from global` references and keep nested fallback variables global when injecting design token fallbacks ([#83359](https://github.com/WordPress/gutenberg/pull/83359)).
 
 ## 2.2.0 (2026-09-23)
 
 
@@ -310,7 +310,7 @@ const { code } = transform( {
 } );
 ```
 
-The visitor preserves CSS Modules [`from global`](https://lightningcss.dev/css-modules.html#local-css-variables) references such as `var(--wpds-dimension-gap-sm from global)` when it adds a fallback.
+The visitor preserves CSS Modules [`from global`](https://lightningcss.dev/css-modules.html#local-css-variables) references such as `var(--wpds-dimension-gap-sm from global)` when it adds a fallback. Custom properties inside generated fallbacks, including `--wp-admin-*` variables, also remain global so admin overrides still apply.
 
 ### esbuild
 
 
@@ -23,11 +23,13 @@ transform( {
 				variable.fallback &&
 				Object.hasOwn( tokenFallbacks, variable.name.ident )
 			) {
-				// Lightning CSS returns `from: null` in visited nodes but
-				// requires null specifiers to be omitted from returned nodes.
+				// Generated fallbacks reference global custom properties.
+				// Keep CSS Modules from scoping them to the consumer's file.
 				const fallback = JSON.parse(
 					JSON.stringify( variable.fallback, ( key, value ) =>
-						key === 'from' && value === null ? undefined : value
+						key === 'from' && value === null
+							? { type: 'global' }
+							: value
 					)
 				);
 				parsedFallbacks.set( variable.name.ident, fallback );
 
@@ -143,21 +143,46 @@ describe( 'design token fallback build plugin parity', () => {
 		expect( lightningcssResult ).toContain( expected );
 	} );
 
-	it( 'preserves from global when adding a fallback with Lightning CSS', () => {
-		const result = lightningcssTransform( {
-			filename: 'styles.module.css',
-			code: Buffer.from(
-				'.fixture { gap: var(--wpds-dimension-gap-sm from global); }'
-			),
-			cssModules: { dashedIdents: true },
-			visitor: lightningcssPlugin,
-		} );
+	it.each( [
+		{
+			property: 'gap',
+			token: '--wpds-dimension-gap-sm',
+			fallback: '8px',
+		},
+		{
+			property: 'outline-width',
+			token: '--wpds-border-width-focus',
+			fallback: 'var(--wp-admin-border-width-focus, 2px)',
+		},
+		{
+			property: 'background-color',
+			token: '--wpds-color-background-interactive-brand-strong',
+			fallback: 'var(--wp-admin-theme-color, #3858e9)',
+		},
+		{
+			property: 'background-color',
+			token: '--wpds-color-background-interactive-brand-strong-active',
+			fallback:
+				'color-mix(in oklch, var(--wp-admin-theme-color, #3858e9) 93.0%, black)',
+		},
+	] )(
+		'preserves global references in $token and its fallback with Lightning CSS',
+		( { property, token, fallback } ) => {
+			const result = lightningcssTransform( {
+				filename: 'styles.module.css',
+				code: Buffer.from(
+					`.fixture { ${ property }: var(${ token } from global); }`
+				),
+				cssModules: { dashedIdents: true },
+				visitor: lightningcssPlugin,
+			} );
 
-		expect( result.code.toString() ).toContain(
-			'gap: var(--wpds-dimension-gap-sm, 8px)'
-		);
-		expect( result.references ).toEqual( {} );
-	} );
+			expect( result.code.toString() ).toContain(
+				`${ property }: var(${ token }, ${ fallback })`
+			);
+			expect( result.references ).toEqual( {} );
+		}
+	);
 
 	it( 'isolates injected fallbacks from changes by composed Lightning CSS visitors', () => {
 		const source = '.fixture { gap: var(--wpds-dimension-gap-sm); }';