From ff3037b4728187dc6721e847c463d8fe62fdff1e Mon Sep 17 00:00:00 2001
From: Juan Aldasoro <juanfraa@gmail.com>
Date: Wed, 17 Jun 2026 18:21:23 +0200
Subject: [PATCH 1/3] Keep save hub button primary while saving.

---
 packages/edit-site/src/components/save-hub/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/edit-site/src/components/save-hub/index.js b/packages/edit-site/src/components/save-hub/index.js
index 61f4df072a7db8..8d773964fa90cd 100644
--- a/packages/edit-site/src/components/save-hub/index.js
+++ b/packages/edit-site/src/components/save-hub/index.js
@@ -31,7 +31,7 @@ export default function SaveHub() {
 		<HStack className="edit-site-save-hub" alignment="right" spacing={ 4 }>
 			<SaveButton
 				className="edit-site-save-hub__button"
-				variant={ isDisabled ? null : 'primary' }
+				variant={ isDisabled && ! isSaving ? null : 'primary' }
 				showTooltip={ false }
 				icon={ isDisabled && ! isSaving ? check : null }
 				showReviewMessage

From c207c3d3cf31de98c5c69a163e9f8109a48d8a9b Mon Sep 17 00:00:00 2001
From: Juan Aldasoro <juanfraa@gmail.com>
Date: Thu, 18 Jun 2026 09:45:59 +0200
Subject: [PATCH 2/3] Migrate experimental HStack to Stack

---
 packages/edit-site/src/components/save-hub/index.js | 6 +++---
 tools/eslint/suppressions.json                      | 5 -----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/packages/edit-site/src/components/save-hub/index.js b/packages/edit-site/src/components/save-hub/index.js
index 8d773964fa90cd..fec03d74adaf1a 100644
--- a/packages/edit-site/src/components/save-hub/index.js
+++ b/packages/edit-site/src/components/save-hub/index.js
@@ -2,7 +2,7 @@
  * WordPress dependencies
  */
 import { useSelect } from '@wordpress/data';
-import { __experimentalHStack as HStack } from '@wordpress/components';
+import { Stack } from '@wordpress/ui';
 import { store as coreStore } from '@wordpress/core-data';
 import { check } from '@wordpress/icons';
 
@@ -28,7 +28,7 @@ export default function SaveHub() {
 		};
 	}, [] );
 	return (
-		<HStack className="edit-site-save-hub" alignment="right" spacing={ 4 }>
+		<Stack className="edit-site-save-hub" direction="row" gap={ 4 }>
 			<SaveButton
 				className="edit-site-save-hub__button"
 				variant={ isDisabled && ! isSaving ? null : 'primary' }
@@ -37,6 +37,6 @@ export default function SaveHub() {
 				showReviewMessage
 				__next40pxDefaultSize
 			/>
-		</HStack>
+		</Stack>
 	);
 }
diff --git a/tools/eslint/suppressions.json b/tools/eslint/suppressions.json
index a4d06957e0b9cf..92a192fc480790 100644
--- a/tools/eslint/suppressions.json
+++ b/tools/eslint/suppressions.json
@@ -895,11 +895,6 @@
 			"count": 4
 		}
 	},
-	"packages/edit-site/src/components/save-hub/index.js": {
-		"@wordpress/use-recommended-components": {
-			"count": 1
-		}
-	},
 	"packages/edit-site/src/components/sidebar-global-styles/index.js": {
 		"@wordpress/use-recommended-components": {
 			"count": 1

From eb6fe178735cbfb9b8e6e7effcac84adda29369d Mon Sep 17 00:00:00 2001
From: Juan Aldasoro <juanfraa@gmail.com>
Date: Thu, 18 Jun 2026 10:06:44 +0200
Subject: [PATCH 3/3] Update stack props and remove duplicate padding.

---
 packages/edit-site/src/components/save-hub/index.js   | 2 +-
 packages/edit-site/src/components/save-hub/style.scss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/edit-site/src/components/save-hub/index.js b/packages/edit-site/src/components/save-hub/index.js
index fec03d74adaf1a..9229a8b5b075f5 100644
--- a/packages/edit-site/src/components/save-hub/index.js
+++ b/packages/edit-site/src/components/save-hub/index.js
@@ -28,7 +28,7 @@ export default function SaveHub() {
 		};
 	}, [] );
 	return (
-		<Stack className="edit-site-save-hub" direction="row" gap={ 4 }>
+		<Stack className="edit-site-save-hub" gap="lg">
 			<SaveButton
 				className="edit-site-save-hub__button"
 				variant={ isDisabled && ! isSaving ? null : 'primary' }
diff --git a/packages/edit-site/src/components/save-hub/style.scss b/packages/edit-site/src/components/save-hub/style.scss
index c1776e38e7d1f6..03e20a98471c31 100644
--- a/packages/edit-site/src/components/save-hub/style.scss
+++ b/packages/edit-site/src/components/save-hub/style.scss
@@ -5,7 +5,7 @@
 	border-top: 1px solid var(--wpds-color-stroke-surface-neutral);
 	flex-shrink: 0;
 	margin: 0;
-	padding: $grid-unit-20 $canvas-padding;
+	padding: $grid-unit-20;
 }
 
 .edit-site-save-hub__button {