diff --git a/resources/js/components/templates/CreateTemplateModal.vue b/resources/js/components/templates/CreateTemplateModal.vue
index 74813b4259..4ab0716efd 100644
--- a/resources/js/components/templates/CreateTemplateModal.vue
+++ b/resources/js/components/templates/CreateTemplateModal.vue
@@ -159,12 +159,14 @@ export default {
         formData.append("user_id", this.currentUserId);
         formData.append("saveAssetsMode", this.saveAssetsMode);
         formData.append("process_category_id", this.process_category_id);
+        this.customModalButtons[1].disabled = true;
         ProcessMaker.apiClient.post("template/" + this.assetType + "/" + this.assetId, formData)
         .then(response => {
           ProcessMaker.alert(this.$t("Template successfully created"), "success");
           this.close();
         }).catch(error => {
           this.errors = error.response.data;
+          this.customModalButtons[1].disabled = false;
           if (this.errors.hasOwnProperty('errors')) {
             this.errors = this.errors.errors;
           } else if (_.includes(this.errors.name, 'The template name must be unique.')) {
@@ -180,14 +182,14 @@ export default {
       },  
       updateTemplate() {   
         let putData = {
-        name: this.name,
-        description: this.description,
-        user_id: this.currentUserId,
-        mode: this.saveAssetsMode,
-        process_id: this.assetId,
-        process_category_id: this.process_category_id,
-      };
-      ProcessMaker.apiClient.put("template/" + this.assetType + "/" + this.existingAssetId, putData)
+          name: this.name,
+          description: this.description,
+          user_id: this.currentUserId,
+          mode: this.saveAssetsMode,
+          process_id: this.assetId,
+          process_category_id: this.process_category_id,
+        };
+        ProcessMaker.apiClient.put("template/" + this.assetType + "/" + this.existingAssetId, putData)
         .then(response => {
           ProcessMaker.alert( this.$t("Template successfully updated"),"success");
           this.close();