diff --git a/packages/block-library/src/buttons/edit.js b/packages/block-library/src/buttons/edit.js
index b2c6858e1448a..ddb371811c7b5 100644
--- a/packages/block-library/src/buttons/edit.js
+++ b/packages/block-library/src/buttons/edit.js
@@ -23,15 +23,15 @@ const alignmentHooksSetting = {
 function ButtonsEdit() {
 	const blockWrapperProps = useBlockWrapperProps();
 	return (
-		<div { ...blockWrapperProps }>
-			<AlignmentHookSettingsProvider value={ alignmentHooksSetting }>
-				<InnerBlocks
-					allowedBlocks={ ALLOWED_BLOCKS }
-					template={ BUTTONS_TEMPLATE }
-					orientation="horizontal"
-				/>
-			</AlignmentHookSettingsProvider>
-		</div>
+		<AlignmentHookSettingsProvider value={ alignmentHooksSetting }>
+			<InnerBlocks
+				allowedBlocks={ ALLOWED_BLOCKS }
+				__experimentalPassedProps={ blockWrapperProps }
+				__experimentalTagName="div"
+				template={ BUTTONS_TEMPLATE }
+				orientation="horizontal"
+			/>
+		</AlignmentHookSettingsProvider>
 	);
 }
 
diff --git a/packages/block-library/src/buttons/editor.scss b/packages/block-library/src/buttons/editor.scss
index 2a07114b65ad5..121ba5f5af5cf 100644
--- a/packages/block-library/src/buttons/editor.scss
+++ b/packages/block-library/src/buttons/editor.scss
@@ -1,6 +1,6 @@
-.wp-block-buttons .wp-block.block-editor-block-list__block[data-type="core/button"] {
-	display: inline-block;
-	width: auto;
+.wp-block-buttons > .wp-block {
+	// Override editor auto block margins.
+	margin-left: 0;
 }
 
 .wp-block[data-align="center"] > .wp-block-buttons {
@@ -15,6 +15,6 @@
 	justify-content: flex-end;
 }
 
-.wp-block-buttons .block-list-appender {
+.wp-block-buttons > .block-list-appender {
 	display: inline-block;
 }