diff --git a/src/common-components/question-chain/question-chain.vue b/src/common-components/question-chain/question-chain.vue
index a248259ab..c9f6c3716 100644
--- a/src/common-components/question-chain/question-chain.vue
+++ b/src/common-components/question-chain/question-chain.vue
@@ -9,7 +9,7 @@
                 :answers="q.answers"
                 :groupName="`${questionData.glassName}-${questionData.glassLocation}-${i}`"
                 v-model="selectedValue"
-                :isRequired=true
+                isRequired
                 :validationRules="validationRules"
                 :clearOnUnmount=false
             />
diff --git a/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue b/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue
index 0c7a75ea7..6f6df03ff 100644
--- a/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue
+++ b/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue
@@ -6,7 +6,7 @@
     :questionText="questionText"
     :answers="vehicles"
     v-model="selectedVehicleVinAsArray"
-    isRequired=true
+    isRequired
     :validation-rules="validationRules"
   />
   <alert 
diff --git a/src/layouts/vehicle-make/make-question/make-question.vue b/src/layouts/vehicle-make/make-question/make-question.vue
index c84c1cdbf..d0046fe30 100644
--- a/src/layouts/vehicle-make/make-question/make-question.vue
+++ b/src/layouts/vehicle-make/make-question/make-question.vue
@@ -8,7 +8,7 @@
     groupName="ChooseVehicleMake"
     textPosition="text-start"
     v-model="selectedValue"
-    isRequired=true
+    isRequired
   />
 </template>
 
diff --git a/src/layouts/vehicle-model/model-question/model-question.vue b/src/layouts/vehicle-model/model-question/model-question.vue
index 3f4e3be7e..096f4d70c 100644
--- a/src/layouts/vehicle-model/model-question/model-question.vue
+++ b/src/layouts/vehicle-model/model-question/model-question.vue
@@ -8,7 +8,7 @@
     groupName="ChooseVehicleModel"
     textPosition="text-start"
     v-model="selectedValue"
-    isRequired=true
+    isRequired
   />
 </template>
 
diff --git a/src/layouts/vehicle-style/style-question/style-question.vue b/src/layouts/vehicle-style/style-question/style-question.vue
index e04822cd6..4e6e90798 100644
--- a/src/layouts/vehicle-style/style-question/style-question.vue
+++ b/src/layouts/vehicle-style/style-question/style-question.vue
@@ -8,7 +8,7 @@
     groupName="ChooseVehicleStyle"
     textPosition="text-start"
     v-model="selectedValue"
-    isRequired=true
+    isRequired
   />
 </template>
 
diff --git a/src/layouts/vehicle-year/year-question/year-question.vue b/src/layouts/vehicle-year/year-question/year-question.vue
index 5892c5dd9..8889a0fdc 100644
--- a/src/layouts/vehicle-year/year-question/year-question.vue
+++ b/src/layouts/vehicle-year/year-question/year-question.vue
@@ -8,7 +8,7 @@
     groupName="ChooseVehicleYear"
     textPosition="text-start"
     v-model="selectedValue"
-    isRequired=true
+    isRequired
   />
 </template>
 
diff --git a/src/ux-components/list-button/list-button.vue b/src/ux-components/list-button/list-button.vue
index 861619093..0c347de52 100644
--- a/src/ux-components/list-button/list-button.vue
+++ b/src/ux-components/list-button/list-button.vue
@@ -6,8 +6,7 @@
     @keyup.up="handleKeyupArrow()"
     @keyup.down="handleKeyupArrow()"
     @keyup.left="handleKeyupArrow()"
-    @keyup.right="handleKeyupArrow()"
-  >
+    @keyup.right="handleKeyupArrow()">
     <input
       :type="isMultiSelect ? 'checkbox' : 'radio'"
       :id="buttonID"
@@ -107,26 +106,25 @@ export default {
       this.isLoaderDisplayed = true;
     },
     handleInputChange() {
-        if(!this.selectingInitiatesLoad) {
-          this.handleCheckChange();
-        }
+      if(this.selectingInitiatesLoad) {
+        this.triggerButton();
+      }
+      else {
+        this.handleCheckChange();
+      }
     },
     handleKeyupArrow() {
       if (this.isMultiSelect) {
         return; // Prevent arrow keys from doing anything if element is a checkbox
       }
 
-      if(!this.selectingInitiatesLoad) {
-        this.handleCheckChange();
-      }
-      this.handleChange(this.value);
+      this.handleInputChange();
     },
     triggerButton() {
       if(this.selectingInitiatesLoad) {
         this.displayLoader();
         this.handleCheckChange();
       }
-      this.handleChange(this.value);
       this.pushEventToGA(this.$route.query[queryStrings.FMG_PAGE], this.GaActions.CLICKED, this.value.toString(), true);
     },
     handleCheckChange() {
@@ -135,6 +133,7 @@ export default {
         value: this.value.toString(),
         buttonId: this.buttonID && this.buttonID.toString(),
       };
+      this.handleChange(this.value);
       this.$emit("isCheckedChanged", emitEvent);
       this.$emit("update:modelValue", emitEvent);
     },