diff --git a/packages/block-library/src/buttons/edit.js b/packages/block-library/src/buttons/edit.js
index f6aa94582b3a6..195019dab9ec0 100644
--- a/packages/block-library/src/buttons/edit.js
+++ b/packages/block-library/src/buttons/edit.js
@@ -22,15 +22,14 @@ const alignmentHooksSetting = {
 
 function ButtonsEdit() {
 	return (
-		<Block.div>
-			<AlignmentHookSettingsProvider value={ alignmentHooksSetting }>
-				<InnerBlocks
-					allowedBlocks={ ALLOWED_BLOCKS }
-					template={ BUTTONS_TEMPLATE }
-					__experimentalMoverDirection="horizontal"
-				/>
-			</AlignmentHookSettingsProvider>
-		</Block.div>
+		<AlignmentHookSettingsProvider value={ alignmentHooksSetting }>
+			<InnerBlocks
+				allowedBlocks={ ALLOWED_BLOCKS }
+				__experimentalTagName={ Block.div }
+				template={ BUTTONS_TEMPLATE }
+				__experimentalMoverDirection="horizontal"
+			/>
+		</AlignmentHookSettingsProvider>
 	);
 }
 
diff --git a/packages/block-library/src/buttons/editor.scss b/packages/block-library/src/buttons/editor.scss
index 2a07114b65ad5..f19c277c5fc3d 100644
--- a/packages/block-library/src/buttons/editor.scss
+++ b/packages/block-library/src/buttons/editor.scss
@@ -1,6 +1,9 @@
 .wp-block-buttons .wp-block.block-editor-block-list__block[data-type="core/button"] {
 	display: inline-block;
 	width: auto;
+
+	// Override editor auto block margins.
+	margin-left: 0;
 }
 
 .wp-block[data-align="center"] > .wp-block-buttons {