From 6e0e180e6259d4cabd65b854e9f34383dce9a37b Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Fri, 11 Oct 2024 09:53:45 +0200
Subject: [PATCH] Fix shuffle button separation

---
 .../block-editor/src/components/block-toolbar/index.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/block-editor/src/components/block-toolbar/index.js b/packages/block-editor/src/components/block-toolbar/index.js
index 4ebf0c0d4c2dd..d6a0985fef361 100644
--- a/packages/block-editor/src/components/block-toolbar/index.js
+++ b/packages/block-editor/src/components/block-toolbar/index.js
@@ -211,10 +211,12 @@ export function PrivateBlockToolbar( {
 					shouldShowVisualToolbar &&
 					isMultiToolbar && <BlockGroupToolbar /> }
 				{ showShuffleButton && (
-					<Shuffle
-						clientId={ blockClientIds[ 0 ] }
-						as={ ToolbarButton }
-					/>
+					<ToolbarGroup>
+						<Shuffle
+							clientId={ blockClientIds[ 0 ] }
+							as={ ToolbarButton }
+						/>
+					</ToolbarGroup>
 				) }
 				{ shouldShowVisualToolbar && (
 					<>