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/README.md b/README.md
index 6b8f2de8d..69ba36bfb 100644
--- a/README.md
+++ b/README.md
@@ -27,4 +27,3 @@ PMM AND SFDO BASE ARE NON-SFDC APPLICATIONS OR THIRD-PARTY APPLICATIONS, AND NOT
 SFDC WILL NOT HAVE ANY LIABILITY ARISING OUT OF OR RELATED TO YOUR USE OF PMM OR SFDO BASE FOR ANY DIRECT DAMAGES OR FOR ANY LOST PROFITS, REVENUES, GOODWILL OR INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL, EXEMPLARY, COVER, BUSINESS INTERRUPTION OR PUNITIVE DAMAGES, WHETHER AN ACTION IS IN CONTRACT OR TORT AND REGARDLESS OF THE THEORY OF LIABILITY, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES OR IF A REMEDY OTHERWISE FAILS OF ITS ESSENTIAL PURPOSE. THE FOREGOING DISCLAIMER WILL NOT APPLY TO THE EXTENT PROHIBITED BY LAW. SFDC DISCLAIMS ALL LIABILITY AND INDEMNIFICATION OBLIGATIONS FOR ANY HARM OR DAMAGES CAUSED BY ANY THIRD-PARTY HOSTING PROVIDERS. 
 
 THIS AGREEMENT SHALL BE GOVERNED EXCLUSIVELY BY, AND CONSTRUED EXCLUSIVELY IN ACCORDANCE WITH, THE LAWS OF THE UNITED STATES AND THE STATE OF CALIFORNIA, WITHOUT REGARD TO ITS CONFLICT OF LAWS PROVISIONS. THE STATE AND FEDERAL COURTS LOCATED IN SAN FRANCISCO, CALIFORNIA SHALL HAVE EXCLUSIVE JURISDICTION TO ADJUDICATE ANY DISPUTE ARISING OUT OF OR RELATING TO THIS AGREEMENT. EACH PARTY HEREBY CONSENTS TO THE JURISDICTION OF SUCH COURTS AND WAIVES ANY RIGHT IT MAY OTHERWISE HAVE TO CHALLENGE THE APPROPRIATENESS OF SUCH FORUMS.
-
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() {