diff --git a/packages/block-editor/src/components/border-radius-control/input-controls.js b/packages/block-editor/src/components/border-radius-control/input-controls.js
index 4529c00b997ac7..139ab7b5a4f905 100644
--- a/packages/block-editor/src/components/border-radius-control/input-controls.js
+++ b/packages/block-editor/src/components/border-radius-control/input-controls.js
@@ -68,21 +68,22 @@ export default function BoxInputControls( {
 					: selectedUnits[ corner ] || selectedUnits.flat;
 
 				return (
-					<Tooltip text={ label } placement="top" key={ corner }>
-						<div className="components-border-radius-control__tooltip-wrapper">
-							<UnitControl
-								{ ...props }
-								aria-label={ label }
-								value={ [ parsedQuantity, computedUnit ].join(
-									''
-								) }
-								onChange={ createHandleOnChange( corner ) }
-								onUnitChange={ createHandleOnUnitChange(
-									corner
-								) }
-								size="__unstable-large"
-							/>
-						</div>
+					<Tooltip
+						text={ label }
+						placement="top"
+						key={ corner }
+						className="components-border-radius-control__tooltip-wrapper"
+					>
+						<UnitControl
+							{ ...props }
+							aria-label={ label }
+							value={ [ parsedQuantity, computedUnit ].join(
+								''
+							) }
+							onChange={ createHandleOnChange( corner ) }
+							onUnitChange={ createHandleOnUnitChange( corner ) }
+							size="__unstable-large"
+						/>
 					</Tooltip>
 				);
 			} ) }