diff --git a/.gitignore b/.gitignore
index 75a96fbfc..577fc12bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # Salesforce / SFDX / CCI
 .cci
 .sfdx
+.sf
 /src.orig
 /src
 
diff --git a/force-app/main/default/lwc/bulkServiceDeliveryUI/bulkServiceDeliveryUI.js b/force-app/main/default/lwc/bulkServiceDeliveryUI/bulkServiceDeliveryUI.js
index c77cd8be4..191efe86a 100644
--- a/force-app/main/default/lwc/bulkServiceDeliveryUI/bulkServiceDeliveryUI.js
+++ b/force-app/main/default/lwc/bulkServiceDeliveryUI/bulkServiceDeliveryUI.js
@@ -180,6 +180,10 @@ export default class BulkServiceDeliveryUI extends NavigationMixin(LightningElem
         return "error";
     }
 
+    get isSaveDisabled() {
+        return this.isSaving;
+    }
+
     addDelivery() {
         let serviceDelivery = {
             index: this._nextIndex,
@@ -221,9 +225,9 @@ export default class BulkServiceDeliveryUI extends NavigationMixin(LightningElem
     // eslint-disable-next-line no-unused-vars
     handleRowError(event) {
         this.errorCount++;
-
         if (this.savingComplete()) {
             this.showSaveSummaryToast();
+            this.isSaving = false;
         }
     }
 
@@ -241,6 +245,7 @@ export default class BulkServiceDeliveryUI extends NavigationMixin(LightningElem
             }
             if (row.isDirty) {
                 this.currentSaveCount++;
+                this.isSaving = true;
             }
             row.saveRow();
         });
@@ -256,6 +261,7 @@ export default class BulkServiceDeliveryUI extends NavigationMixin(LightningElem
 
         if (this.savingComplete()) {
             this.showSaveSummaryToast();
+            this.isSaving = false;
         }
 
         if (this.savedCount === this.targetSaveCount) {
diff --git a/force-app/main/default/lwc/serviceScheduleCreator/serviceScheduleCreator.js b/force-app/main/default/lwc/serviceScheduleCreator/serviceScheduleCreator.js
index dd7eba3ac..7297d8a68 100644
--- a/force-app/main/default/lwc/serviceScheduleCreator/serviceScheduleCreator.js
+++ b/force-app/main/default/lwc/serviceScheduleCreator/serviceScheduleCreator.js
@@ -354,8 +354,8 @@ export default class ServiceScheduleCreator extends NavigationMixin(LightningEle
             this.navigate();
         } else {
             this.init();
+            this.dispatchEvent(new CustomEvent("close", { bubbles: true }));
         }
-        this.dispatchEvent(new CustomEvent("close", { bubbles: true }));
     }
 
     reset() {