diff --git a/src/ux-components/list-button/list-button.vue b/src/ux-components/list-button/list-button.vue
index 861619093..24682c49f 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"
@@ -119,14 +118,12 @@ export default {
       if(!this.selectingInitiatesLoad) {
         this.handleCheckChange();
       }
-      this.handleChange(this.value);
     },
     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 +132,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);
     },