diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 812870f83..0671c1015 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -271,7 +271,7 @@ export default {
 
                     // call saveSession here - navigateWithSaving saves too late in the flow
                     await saveSession({});
-                    return this.$router.navigateWithoutSaving(
+                    return this.$router.navigateWithSaving(
                         this.navigationScenarios.CLICKED_FORWARD_WITH_NO_QUESTIONS,
                         this.$route
                     );
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index f2fc72b38..5e2ec0c71 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -325,6 +325,17 @@ export default {
                 false
             );
 
+            if (this.isWindshieldRepair) {
+                const supportingItems = await this.dispatchStoreAction(
+                    storeActions.GET_SUPPORTING_ITEMS
+                );
+                this.dispatchStoreAction(
+                    this.storeActions.SAVE_SUPPORTING_ITEMS,
+                    supportingItems.data,
+                    false
+                );
+            }
+
             return this.navigateForward();
         },