diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
index 6cbb176847..9acdbb4acd 100644
--- a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
+++ b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
@@ -839,6 +839,10 @@ export default ['$scope', 'TemplatesService',
                     $scope.cancelLinkForm();
                 }
 
+                if ($scope.nodeConfig && $scope.nodeConfig.nodeId === nodeId) {
+                    $scope.cancelNodeForm();
+                }
+
                 // Remove the node from the array
                 for( let i = $scope.graphState.arrayOfNodesForChart.length; i--; ){
                     if ($scope.graphState.arrayOfNodesForChart[i].id === nodeId) {