diff --git a/src/common-components/modal/modal.vue b/src/common-components/modal/modal.vue
index e965b3e3f..9845e0891 100644
--- a/src/common-components/modal/modal.vue
+++ b/src/common-components/modal/modal.vue
@@ -2,6 +2,7 @@
     <!-- Modal -->
     <div
         class="modal fade modal-component"
+        v-on="{ 'hidden.bs.modal': resetButtonStyle }"
         :id="this.cmsWidgetName"
         tabindex="-1"
         aria-labelledby="ModalComponentLabel"
@@ -61,16 +62,10 @@ export default {
         },
     },
     methods: {
-        setupModalEventListener() {
-            const modal = document.querySelector("#" + this.cmsWidgetName);
-            modal.addEventListener("hidden.bs.modal", (event) => {
-                this.$refs.buttonMain.resetButtonStyle();
-            });
+        resetButtonStyle() {
+            this.$refs.buttonMain.resetButtonStyle();
         },
     },
-    mounted() {
-        this.setupModalEventListener();
-    },
     components: {
         buttonMain,
     },
diff --git a/src/ux-components/button-main/button-main.vue b/src/ux-components/button-main/button-main.vue
index 5c705f49d..bbea1b8d0 100644
--- a/src/ux-components/button-main/button-main.vue
+++ b/src/ux-components/button-main/button-main.vue
@@ -55,9 +55,6 @@ export default {
             this.isLoaderDisplayed = false;
         },
     },
-    mounted() {
-        this.isLoaderDisplayed = false;
-    },
     components: {
         loader,
     },