diff --git a/src/common-components/button-question/button-question.vue b/src/common-components/button-question/button-question.vue
index 6a2cbe165..9fdb19a7b 100644
--- a/src/common-components/button-question/button-question.vue
+++ b/src/common-components/button-question/button-question.vue
@@ -51,7 +51,7 @@
               :groupName="groupName"
               :value="answer.value"
               :modelValue="modelValue"
-              selectingInitiatesLoad
+              :selectingInitiatesLoad="selectingInitiatesLoad"
               :isWide="isWide"
               :validationRules="validationRules"
               :textPosition="textPosition"
diff --git a/src/common-components/input-button-wrapper/input-button-wrapper.vue b/src/common-components/input-button-wrapper/input-button-wrapper.vue
index a1295f1bd..4c9e04397 100644
--- a/src/common-components/input-button-wrapper/input-button-wrapper.vue
+++ b/src/common-components/input-button-wrapper/input-button-wrapper.vue
@@ -18,7 +18,7 @@
       :checked="isChecked"
       @keypress.enter="handleEventAction('keypressSubmit', $event)"
       @keypress.space="handleEventAction('keypressSubmit', $event)"
-      @change="handleEventAction('keypress', $event)"
+      @change="handleEventAction('change', $event)"
     />
 
     <slot></slot>
@@ -84,7 +84,7 @@ export default {
   methods: {
     handleEventAction(eventType, e) {
       const eventTypes = {
-        KEYPRESS: "keypress",
+        CHANGE: "change",
         KEYPRESS_SUBMIT: "keypressSubmit",
         CLICK: "click",
       };
@@ -96,7 +96,7 @@ export default {
             console.log("clicking");
             this.handleClick(e);
             break;
-          case eventTypes.KEYPRESS:
+          case eventTypes.CHANGE:
             console.log("selectOnKeypress: ", this.selectOnKeypress);
             this.selectOnKeypress
               ? this.handleClick(e)
@@ -105,7 +105,7 @@ export default {
         }
       }
 
-      this.hasFirstEventFired = eventType !== eventTypes.KEYPRESS;
+      this.hasFirstEventFired = eventType !== eventTypes.CHANGE;
 
       console.log("handleKeypress: ", eventType);
       // console.log({
diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.vue b/src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.vue
index 25d273eca..a08cc69af 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.vue
@@ -7,7 +7,7 @@
                 :groupName="groupName"
                 buttonType="listButtonHorizontal"
                 useTextForValue
-                v-model="selectedChipCountValues"
+                v-model="selectedValue"
                 :validationRules="validationRules"
                 isRequired
             />
@@ -17,9 +17,11 @@
 
 <script>
 import buttonQuestion from "@/common-components/button-question/button-question";
+import buttonQuestionWrapperMixin from "@/mixins/button-question-wrapper-mixin";
 
 export default ({
     name: "windshieldOptions",   
+    mixins: [buttonQuestionWrapperMixin],
     props: {
         modelValue: Array,
         groupName: String,
@@ -42,14 +44,6 @@ export default ({
         answersFromCms(){
             return this.getCmsContent(this.cmsWidgetName, 'Answers');
         },
-        selectedChipCountValues: {
-            get: function() {
-                return this.modelValue;
-            },
-            set: function(newValue) {
-                this.$emit("update:modelValue", newValue);
-            }
-        },
     },
     watch: {
         isAvailable(val) {