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/style.scss b/packages/block-library/src/buttons/style.scss
index a16c5e3e23faa..4649c14de6ad9 100644
--- a/packages/block-library/src/buttons/style.scss
+++ b/packages/block-library/src/buttons/style.scss
@@ -1,6 +1,7 @@
 // Increased specificity to override blocks default margin.
 .wp-block-buttons .wp-block-button {
 	display: inline-block;
+	margin-left: 0;
 	margin-right: $grid-unit-10;
 	margin-bottom: $grid-unit-10;