diff --git a/packages/block-editor/src/components/colors-gradients/control.js b/packages/block-editor/src/components/colors-gradients/control.js
index 9591b96838a120..9009c0411f465a 100644
--- a/packages/block-editor/src/components/colors-gradients/control.js
+++ b/packages/block-editor/src/components/colors-gradients/control.js
@@ -129,40 +129,42 @@ function ColorGradientControlInner( {
 						</legend>
 					) }
 					{ canChooseAColor && canChooseAGradient && (
-						<Tabs
-							initialTabId={
-								gradientValue
-									? TAB_IDS.gradient
-									: !! canChooseAColor && TAB_IDS.color
-							}
-						>
-							<Tabs.TabList>
-								<Tabs.Tab id={ TAB_IDS.color }>
-									{ __( 'Solid' ) }
-								</Tabs.Tab>
-								<Tabs.Tab id={ TAB_IDS.gradient }>
-									{ __( 'Gradient' ) }
-								</Tabs.Tab>
-							</Tabs.TabList>
-							<Tabs.TabPanel
-								id={ TAB_IDS.color }
-								className={
-									'block-editor-color-gradient-control__panel'
+						<div>
+							<Tabs
+								initialTabId={
+									gradientValue
+										? TAB_IDS.gradient
+										: !! canChooseAColor && TAB_IDS.color
 								}
-								focusable={ false }
 							>
-								{ tabPanels.color }
-							</Tabs.TabPanel>
-							<Tabs.TabPanel
-								id={ TAB_IDS.gradient }
-								className={
-									'block-editor-color-gradient-control__panel'
-								}
-								focusable={ false }
-							>
-								{ tabPanels.gradient }
-							</Tabs.TabPanel>
-						</Tabs>
+								<Tabs.TabList>
+									<Tabs.Tab id={ TAB_IDS.color }>
+										{ __( 'Solid' ) }
+									</Tabs.Tab>
+									<Tabs.Tab id={ TAB_IDS.gradient }>
+										{ __( 'Gradient' ) }
+									</Tabs.Tab>
+								</Tabs.TabList>
+								<Tabs.TabPanel
+									id={ TAB_IDS.color }
+									className={
+										'block-editor-color-gradient-control__panel'
+									}
+									focusable={ false }
+								>
+									{ tabPanels.color }
+								</Tabs.TabPanel>
+								<Tabs.TabPanel
+									id={ TAB_IDS.gradient }
+									className={
+										'block-editor-color-gradient-control__panel'
+									}
+									focusable={ false }
+								>
+									{ tabPanels.gradient }
+								</Tabs.TabPanel>
+							</Tabs>
+						</div>
 					) }
 
 					{ ! canChooseAGradient && renderPanelType( TAB_IDS.color ) }