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 e6c706b8c8..0665098a11 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
@@ -252,8 +252,7 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
                          }
                     }
 
-                    if ((params.node.originalParentId && params.parentId !== params.node.originalParentId) || params.node.originalEdge !== params.node.edgeType) {//beep
-
+                    if (params.node.originalParentId && (params.parentId !== params.node.originalParentId || params.node.originalEdge !== params.node.edgeType)) {
                         let parentIsDeleted = false;
 
                         _.forEach($scope.treeData.data.deletedNodes, function(deletedNode) {
@@ -977,6 +976,10 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
 
         $scope.templateManuallySelected = function(selectedTemplate) {
 
+            if (surveyQuestionWatcher) {
+                surveyQuestionWatcher();
+            }
+
             if (selectedTemplate.type === "job_template") {
                 let jobTemplate = new JobTemplate();