diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.controller.js b/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.controller.js
index 4f5a855b46..e622a31782 100644
--- a/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.controller.js
+++ b/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.controller.js
@@ -154,23 +154,28 @@ export default ['$scope', 'TemplatesService', 'JobTemplateModel', 'PromptService
                             return $scope.strings.get('workflow_maker.INVENTORY_WILL_OVERRIDE');
                         }
                     }
-                     if (workflowJobTemplateObj.ask_inventory_on_launch) {
+
+                    if (workflowJobTemplateObj.ask_inventory_on_launch) {
                         if (selectedTemplate.ask_inventory_on_launch) {
                             return $scope.strings.get('workflow_maker.INVENTORY_PROMPT_WILL_OVERRIDE');
                         }
                     }
                 }
+
                 if (selectedTemplate.type === "job_template") {
                     if (workflowJobTemplateObj.inventory) {
                         if (selectedTemplate.ask_inventory_on_launch) {
                             return $scope.strings.get('workflow_maker.INVENTORY_WILL_OVERRIDE');
                         }
+
                         return $scope.strings.get('workflow_maker.INVENTORY_WILL_NOT_OVERRIDE');
                     }
+
                     if (workflowJobTemplateObj.ask_inventory_on_launch) {
                         if (selectedTemplate.ask_inventory_on_launch) {
                             return $scope.strings.get('workflow_maker.INVENTORY_PROMPT_WILL_OVERRIDE');
                         }
+
                         return $scope.strings.get('workflow_maker.INVENTORY_PROMPT_WILL_NOT_OVERRIDE');
                     }
                 }
diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.partial.html b/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.partial.html
index ca232115b8..56ed5f85a0 100644
--- a/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.partial.html
+++ b/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.partial.html
@@ -236,7 +236,7 @@
     <div ng-show="editNodeHelpMessage && activeTab === 'jobs'" class="WorkflowMaker-formHelp" ng-bind="editNodeHelpMessage"></div>
     <br />
     <div class="buttons Form-buttons" id="workflow_maker_controls">
-        <button type="button" class="btn btn-sm Form-primaryButton Form-primaryButton--noMargin" id="workflow_maker_prompt_btn" ng-show="showPromptButton" ng-click="openPromptModal()"> {{:: strings.get('prompt.PROMPT') }}</button>
+        <button type="button" class="btn btn-sm Form-primaryButton Form-primaryButton--noMargin" id="workflow_maker_prompt_btn" ng-show="showPromptButton && activeTab == 'jobs' " ng-click="openPromptModal()"> {{:: strings.get('prompt.PROMPT') }}</button>
         <button type="button" class="btn btn-sm Form-cancelButton" id="workflow_maker_cancel_btn" ng-show="!readOnly" ng-click="cancel()"> {{:: strings.get('CANCEL') }}</button>
         <button type="button" class="btn btn-sm Form-cancelButton" id="workflow_maker_close_btn" ng-show="readOnly" ng-click="cancel()"> {{:: strings.get('CLOSE') }}</button>
         <button type="button" class="btn btn-sm Form-saveButton" id="workflow_maker_select_btn" ng-show="!readOnly" ng-click="select({selectedTemplate, promptData, edgeType})" ng-disabled="!selectedTemplate || promptModalMissingReqFields || credentialRequiresPassword || selectedTemplateInvalid"> {{:: strings.get('workflow_maker.SELECT') }}</button>