diff --git a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
index 4dc59ef378f29..f433a077baa4a 100644
--- a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
+++ b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
@@ -623,6 +623,8 @@ function goToUpgrade() {
 					type="primary"
 					:saved="!uiStore.stateIsDirty && !isNewWorkflow"
 					:disabled="isWorkflowSaving || readOnly"
+					with-shortcut
+					:shortcut-tooltip="$locale.baseText('saveWorkflowButton.hint')"
 					data-test-id="workflow-save-button"
 					@click="onSaveButtonClick"
 				/>
diff --git a/packages/editor-ui/src/components/SaveButton.vue b/packages/editor-ui/src/components/SaveButton.vue
index 7d332c2ca4694..738ddf46b9f98 100644
--- a/packages/editor-ui/src/components/SaveButton.vue
+++ b/packages/editor-ui/src/components/SaveButton.vue
@@ -1,20 +1,30 @@
 <template>
 	<span :class="$style.container" data-test-id="save-button">
 		<span v-if="saved" :class="$style.saved">{{ $locale.baseText('saveButton.saved') }}</span>
-		<KeyboardShortcutTooltip
-			v-else
-			:label="$locale.baseText('saveButton.hint')"
-			:shortcut="{ keys: ['s'], metaKey: true }"
-			placement="bottom"
-		>
+		<template v-else>
+			<KeyboardShortcutTooltip
+				v-if="withShortcut"
+				:label="shortcutTooltipLabel"
+				:shortcut="{ keys: ['s'], metaKey: true }"
+				placement="bottom"
+			>
+				<n8n-button
+					:label="saveButtonLabel"
+					:loading="isSaving"
+					:disabled="disabled"
+					:class="$style.button"
+					:type="type"
+				/>
+			</KeyboardShortcutTooltip>
 			<n8n-button
+				v-else
 				:label="saveButtonLabel"
 				:loading="isSaving"
 				:disabled="disabled"
 				:class="$style.button"
 				:type="type"
 			/>
-		</KeyboardShortcutTooltip>
+		</template>
 	</span>
 </template>
 
@@ -50,6 +60,13 @@ export default defineComponent({
 			type: String,
 			default: 'primary',
 		},
+		withShortcut: {
+			type: Boolean,
+			default: false,
+		},
+		shortcutTooltip: {
+			type: String,
+		},
 	},
 	computed: {
 		saveButtonLabel() {
@@ -57,6 +74,9 @@ export default defineComponent({
 				? this.$locale.baseText('saveButton.saving')
 				: this.$locale.baseText('saveButton.save');
 		},
+		shortcutTooltipLabel() {
+			return this.shortcutTooltip ?? this.$locale.baseText('saveButton.save');
+		},
 	},
 });
 </script>
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index c3da88f8f75aa..e6c5c21fd7332 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -1455,7 +1455,7 @@
 	"runData.aiContentBlock.tokens.completion": "Completion:",
 	"saveButton.save": "@:_reusableBaseText.save",
 	"saveButton.saved": "Saved",
-	"saveButton.hint": "Save workflow",
+	"saveWorkflowButton.hint": "Save workflow",
 	"saveButton.saving": "Saving",
 	"settings": "Settings",
 	"settings.communityNodes": "Community nodes",