diff --git a/packages/frontend/editor-ui/src/components/NodeExecuteButton.vue b/packages/frontend/editor-ui/src/components/NodeExecuteButton.vue
index 8ef10dd1be..ea11462dd6 100644
--- a/packages/frontend/editor-ui/src/components/NodeExecuteButton.vue
+++ b/packages/frontend/editor-ui/src/components/NodeExecuteButton.vue
@@ -155,7 +155,7 @@ const disabledHint = computed(() => {
 		return i18n.baseText('ndv.execute.generatingCode');
 	}
 
-	if (isTriggerNode.value && node?.value?.disabled) {
+	if (node?.value?.disabled) {
 		return i18n.baseText('ndv.execute.nodeIsDisabled');
 	}
 
diff --git a/packages/frontend/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.vue b/packages/frontend/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.vue
index 2c552d757c..ae47fe8d01 100644
--- a/packages/frontend/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.vue
+++ b/packages/frontend/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.vue
@@ -94,17 +94,23 @@ function onMouseLeave() {
 		@mouseleave="onMouseLeave"
 	>
 		<div :class="$style.canvasNodeToolbarItems">
-			<N8nIconButton
-				v-if="isExecuteNodeVisible"
-				data-test-id="execute-node-button"
-				type="tertiary"
-				text
-				size="small"
-				icon="play"
-				:disabled="isExecuting"
-				:title="i18n.baseText('node.testStep')"
-				@click="executeNode"
-			/>
+			<N8nTooltip
+				placement="top"
+				:disabled="!isDisabled"
+				:content="i18n.baseText('ndv.execute.deactivated')"
+			>
+				<N8nIconButton
+					v-if="isExecuteNodeVisible"
+					data-test-id="execute-node-button"
+					type="tertiary"
+					text
+					size="small"
+					icon="play"
+					:disabled="isExecuting || isDisabled"
+					:title="i18n.baseText('node.testStep')"
+					@click="executeNode"
+				/>
+			</N8nTooltip>
 			<N8nIconButton
 				v-if="isDisableNodeVisible"
 				data-test-id="disable-node-button"
diff --git a/packages/frontend/editor-ui/src/plugins/i18n/locales/en.json b/packages/frontend/editor-ui/src/plugins/i18n/locales/en.json
index bdcf6c2419..68c7a8781b 100644
--- a/packages/frontend/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/frontend/editor-ui/src/plugins/i18n/locales/en.json
@@ -976,6 +976,7 @@
 	"ndv.execute.requiredFieldsMissing": "Complete required fields first",
 	"ndv.execute.stopWaitingForWebhook.error": "Problem deleting test webhook",
 	"ndv.execute.workflowAlreadyRunning": "Workflow is already running",
+	"ndv.execute.deactivated": "This node is deactivated and can't be run",
 	"ndv.featureRequest": "I wish this node would...",
 	"ndv.input": "Input",
 	"ndv.input.nodeDistance": "{count} node back | {count} nodes back",