diff --git a/frappe/public/js/workflow_builder/WorkflowBuilder.vue b/frappe/public/js/workflow_builder/WorkflowBuilder.vue
index a0047952a1..ef4daa4e8c 100644
--- a/frappe/public/js/workflow_builder/WorkflowBuilder.vue
+++ b/frappe/public/js/workflow_builder/WorkflowBuilder.vue
@@ -20,6 +20,7 @@ const {
 	onNodeDragStop,
 	onConnect,
 	onEdgeUpdate,
+	onEdgeUpdateEnd,
 	addNodes,
 	addEdges,
 	setEdges,
@@ -155,6 +156,15 @@ onConnect(edge => {
 	});
 });
 
+onEdgeUpdateEnd(({ edge }) => {
+	getSelectedNodes.value?.forEach(node => (node.selected = false));
+	if (edge.source.startsWith("action-")) {
+		setTimeout(() => (findNode(edge.source).selected = true));
+	} else if (edge.target.startsWith("action-")){
+		setTimeout(() => (findNode(edge.target).selected = true));
+	}
+})
+
 onEdgeUpdate(({ edge, connection }) => {
 	if (
 		(connection.source == edge.source && connection.target != edge.target) ||