From 27c4540870b5524c448c3d319051846062fa3323 Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Mon, 9 Dec 2024 11:58:47 +0100
Subject: [PATCH] Fix edge case

---
 packages/components/src/box-control/input-control.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/components/src/box-control/input-control.tsx b/packages/components/src/box-control/input-control.tsx
index 992459a5587155..6678cf1fdbd31d 100644
--- a/packages/components/src/box-control/input-control.tsx
+++ b/packages/components/src/box-control/input-control.tsx
@@ -139,6 +139,8 @@ export default function BoxInputControl( {
 		: selectedUnits[ defaultValuesToModify[ 0 ] ];
 	const generatedId = useInstanceId( BoxInputControl, 'box-control-input' );
 	const inputId = [ generatedId, side ].join( '-' );
+	const usedValue =
+		mergedValue === undefined && computedUnit ? computedUnit : mergedValue;
 
 	return (
 		<InputWrapper key={ `box-control-${ side }` } expanded>
@@ -151,7 +153,7 @@ export default function BoxInputControl( {
 					className="component-box-control__unit-control"
 					id={ inputId }
 					isPressEnterToChange
-					value={ mergedValue }
+					value={ usedValue }
 					onChange={ handleOnValueChange }
 					onUnitChange={ handleOnUnitChange }
 					onFocus={ handleOnFocus }