diff --git a/awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js b/awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js
index 9cd73e1da7..f88b1057df 100644
--- a/awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js
+++ b/awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js
@@ -341,7 +341,6 @@
                     Rest.post(data)
                         .then(({data}) => {
 
-                            Wait('stop');
                             if (data.related && data.related.callback) {
                                 Alert('Callback URL',
                                     `Host callbacks are enabled for this template. The callback URL is:
diff --git a/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js b/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js
index fa5d74219a..75bc0ecf2a 100644
--- a/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js
+++ b/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js
@@ -496,7 +496,7 @@ export default
                 $scope.removeTemplateSaveSuccess();
             }
             $scope.removeTemplateSaveSuccess = $scope.$on('templateSaveSuccess', function(e, data) {
-                Wait('stop');
+
                 if (data.related &&
                     data.related.callback) {
                     Alert('Callback URL',
@@ -606,6 +606,7 @@ export default
                         }
                         $q.all(defers)
                             .then(function() {
+                                Wait('stop');
                                 saveCompleted();
                             });
                     });