diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/CanvasRunWorkflowButton.vue b/packages/editor-ui/src/components/canvas/elements/buttons/CanvasRunWorkflowButton.vue
index 54acad2fe0..64520e479c 100644
--- a/packages/editor-ui/src/components/canvas/elements/buttons/CanvasRunWorkflowButton.vue
+++ b/packages/editor-ui/src/components/canvas/elements/buttons/CanvasRunWorkflowButton.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import KeyboardShortcutTooltip from '@/components/KeyboardShortcutTooltip.vue';
-import { computed, ref } from 'vue';
+import { computed, ref, unref } from 'vue';
 import { useI18n } from '@/composables/useI18n';
 import type { INodeUi } from '@/Interface';
 import { N8nActionDropdown } from 'n8n-design-system';
@@ -36,7 +36,7 @@ const label = computed(() => {
 const actions = computed(() => {
 	return props.triggerNodes.map((triggerNode) => {
 		return {
-			id: triggerNode.name,
+			id: triggerNode.id,
 			label: triggerNode.name,
 			disabled: triggerNode.disabled,
 		};
@@ -44,7 +44,7 @@ const actions = computed(() => {
 });
 
 const onActionSelect = (item: string) => {
-	selectedTrigger.value = item;
+	selectedTrigger.value = actions.value.find((x) => x.id === item)?.label;
 };
 </script>
 
@@ -53,9 +53,10 @@ const onActionSelect = (item: string) => {
 		<div :class="$style.actionWrapper">
 			<KeyboardShortcutTooltip :label="label" :shortcut="{ metaKey: true, keys: ['↵'] }">
 				<N8nButton
-					:class="$style.firstButton"
+					:class="{
+						[$style.firstButton]: triggerNodes.length > 1,
+					}"
 					:loading="executing"
-					:label="label"
 					:disabled="disabled"
 					size="large"
 					icon="flask"
@@ -64,7 +65,10 @@ const onActionSelect = (item: string) => {
 					@mouseenter="$emit('mouseenter', $event)"
 					@mouseleave="$emit('mouseleave', $event)"
 					@click.stop="$emit('click', $event, selectedTrigger)"
-				/>
+					>{{
+						label + (selectedTrigger && triggerNodes.length > 1 ? ` from "${selectedTrigger}"` : '')
+					}}</N8nButton
+				>
 			</KeyboardShortcutTooltip>
 			<div :class="$style.line"></div>
 			<N8nActionDropdown v-if="triggerNodes.length > 1" :items="actions" @select="onActionSelect">
@@ -85,12 +89,12 @@ const onActionSelect = (item: string) => {
 
 .firstButton {
 	border-right: none;
-	border-radius: 8px 0 0 8px;
+	border-radius: 4px 0 0 4px; // hardcoded
 }
 
 .lastButton {
 	border-left: none;
-	border-radius: 0 8px 8px 0;
+	border-radius: 0 4px 4px 0; // hardcoded
 }
 
 .line {
diff --git a/packages/editor-ui/src/composables/useRunWorkflow.ts b/packages/editor-ui/src/composables/useRunWorkflow.ts
index 658e35b3c6..fce3421e1b 100644
--- a/packages/editor-ui/src/composables/useRunWorkflow.ts
+++ b/packages/editor-ui/src/composables/useRunWorkflow.ts
@@ -69,7 +69,6 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 		uiStore.addActiveAction('workflowRunning');
 
 		let response: IExecutionPushResponse;
-
 		try {
 			response = await workflowsStore.runWorkflow(runData);
 		} catch (error) {
@@ -149,16 +148,15 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 			) {
 				executedNode = options.destinationNode;
 				startNodeNames.push(options.destinationNode);
-			} else if ('triggerNode' in options && 'nodeData' in options) {
+			} else if ('triggerNode' in options) {
 				startNodeNames.push(
 					...workflow.getChildNodes(options.triggerNode as string, NodeConnectionType.Main, 1),
 				);
 				newRunData = {
-					[options.triggerNode as string]: [options.nodeData],
+					[options.triggerNode as string]: options.nodeData ? [options.nodeData] : [],
 				} as IRunData;
 				executedNode = options.triggerNode;
 			}
-
 			// If the destination node is specified, check if it is a chat node or has a chat parent
 			if (
 				options.destinationNode &&
@@ -301,7 +299,6 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 				nodeName: options.destinationNode,
 				source: options.source,
 			});
-
 			return runWorkflowApiResponse;
 		} catch (error) {
 			workflowHelpers.setDocumentTitle(workflow.name as string, 'ERROR');
diff --git a/packages/editor-ui/src/views/NodeView.v2.vue b/packages/editor-ui/src/views/NodeView.v2.vue
index 4a905796b7..fe5e21a0b9 100644
--- a/packages/editor-ui/src/views/NodeView.v2.vue
+++ b/packages/editor-ui/src/views/NodeView.v2.vue
@@ -1008,7 +1008,7 @@ const workflowExecutionData = computed(() => workflowsStore.workflowExecutionDat
 
 async function onRunWorkflow(triggerNode?: string) {
 	trackRunWorkflow();
-
+	console.log('triggerNode 1', triggerNode);
 	if (!isExecutionPreview.value && workflowsStore.isWaitingExecution) {
 		void runWorkflowResolvePending({ triggerNode });
 	} else {
@@ -1624,7 +1624,7 @@ onBeforeUnmount(() => {
 				:trigger-nodes="triggerNodes"
 				@mouseenter="onRunWorkflowButtonMouseEnter"
 				@mouseleave="onRunWorkflowButtonMouseLeave"
-				@click="($event, selectedTrigger) => onRunWorkflow(selectedTrigger)"
+				@click="(_e, selectedTrigger) => onRunWorkflow(selectedTrigger)"
 			/>
 			<CanvasChatButton v-if="containsChatTriggerNodes" @click="onOpenChat" />
 			<CanvasStopCurrentExecutionButton