diff --git a/src/digital-components/base-input-button/base-input-button.vue b/src/digital-components/base-input-button/base-input-button.vue
index 301bb52e..f619a16e 100644
--- a/src/digital-components/base-input-button/base-input-button.vue
+++ b/src/digital-components/base-input-button/base-input-button.vue
@@ -74,7 +74,8 @@ export default {
                 return this.modelValue.includes(this.value);
             }
             if (!this.isMultiSelect) {
-                return this.modelValue === this.value;
+                // eslint-disable-next-line eqeqeq
+                return this.modelValue == this.value;
             }
             return false;
         },
diff --git a/src/layouts/vehicle-damage/vehicle-damage.spec.js b/src/layouts/vehicle-damage/vehicle-damage.spec.js
index 56a6c4dd..f2f911f7 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.spec.js
+++ b/src/layouts/vehicle-damage/vehicle-damage.spec.js
@@ -3,6 +3,7 @@ import { mount, flushPromises } from '@vue/test-utils';
 import { createTestingPinia } from '@pinia/testing';
 import navigationScenarios from '@/router/router-constants/navigation-scenarios';
 import routerParams from '@/router/router-constants/router-params';
+import { useMainStore } from '@/store';
 import vehicleCategories from '@/constants/vehicle-categories';
 import VehicleDamageComponent from '@/layouts/vehicle-damage/vehicle-damage.vue';
 
@@ -69,6 +70,21 @@ describe('vehicle-damage.vue', () => {
         const wrapper = mount(VehicleDamageComponent, mountOptions);
         const siteFooterWrapper = wrapper.getComponent({ ref: 'siteFooter' });
 
+        useMainStore().getSupportingItems = jest.fn().mockImplementation(() => Promise.resolve({
+            data: { data: [
+                {
+                    description: null,
+                    partNumber: 'SUPPLIES-REPAIR',
+                    partType: 'REPAIR FEE'
+                },
+                {
+                    description: null,
+                    partNumber: 'WSREPAIR',
+                    partType: 'REPAIR FEE'
+                }
+            ] }
+        }));
+
         siteFooterWrapper.vm.$emit('forwardClicked');
 
         await flushPromises();
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 595aef6f..4a53e854 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -364,11 +364,17 @@ export default {
         },
 
         async forwardButtonAction() {
-            await this.mainStore.saveVehicleDamage(
+            this.mainStore.saveVehicleDamage(
                 this.isWindshieldRepair,
                 this.selectedGlassToReplace(),
                 this.selectedWindshieldOptions.selectedWindshieldChipCount
             );
+
+            if (this.isWindshieldRepair) {
+                const supportingItems = await useMainStore().getSupportingItems();
+                this.mainStore.saveSupportingItems(supportingItems.data);
+            }
+
             return this.navigateForward();
         },