diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.directive.js b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.directive.js
index 0a7f9ac1c9..ffb9b354b1 100644
--- a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.directive.js
+++ b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.directive.js
@@ -62,15 +62,15 @@ export default ['templateUrl', 'CreateDialog', 'Wait', '$state', '$window',
                     scope.$broadcast("refreshWorkflowChart");
                 });
 
-                scope.closeDialog = function() {
-                    if (scope.workflowChangesUnsaved || scope.workflowChangesStarted) {
-                        scope.unsavedChangesVisible = true;
-                    } else {
+                scope.closeDialog = function(exitWithUnsavedChanges) {
+                    if (exitWithUnsavedChanges || !(scope.workflowChangesUnsaved || scope.workflowChangesStarted)) {
                         scope.unsavedChangesVisible = false;
                         $('#workflow-modal-dialog').dialog('destroy');
                         $('body').removeClass('WorkflowMaker-preventBodyScrolling');
 
                         $state.go('^');
+                    } else {
+                        scope.unsavedChangesVisible = true;
                     }
                 };
 
diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html
index d04f2c2264..e9d7cc8a60 100644
--- a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html
+++ b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html
@@ -40,7 +40,7 @@
                     <div class="Prompt-bodyQuery">{{strings.get('workflow_maker.UNSAVED_CHANGES_PROMPT_TEXT')}}</div>
                 </div>
                 <div class="Modal-footer">
-                    <button ng-click="closeDialog()" class="btn Modal-footerButton Modal-errorButton">{{strings.get('workflow_maker.EXIT')}}</button>
+                    <button ng-click="closeDialog(true)" class="btn Modal-footerButton Modal-errorButton">{{strings.get('workflow_maker.EXIT')}}</button>
                     <button ng-click="cancelUnsavedChanges()" class="btn Modal-footerButton Modal-defaultButton">{{strings.get('workflow_maker.CANCEL')}}</button>
                     <button
                         ng-hide="formState.showNodeForm || formState.showLinkForm"