diff --git a/src/components/CreateGroupDialog.vue b/src/components/CreateGroupDialog.vue
index 326107643..8bac1ccd0 100644
--- a/src/components/CreateGroupDialog.vue
+++ b/src/components/CreateGroupDialog.vue
@@ -33,21 +33,12 @@
 import { Modal } from "bootstrap";
 
 export default {
-    beforeRouteLeave(to, from, next) {
-        this.cleanupModal();
-        next();
-    },
     props: {},
     emits: [ "added" ],
     data: () => ({
         modal: null,
         groupName: null,
     }),
-    watch: {
-        $route(to, from) {
-            this.cleanupModal();
-        }
-    },
     mounted() {
         this.modal = new Modal(this.$refs.modal);
     },
@@ -82,9 +73,6 @@ export default {
                     console.warn("Modal hide failed:", e);
                 }
             }
-            document.body.classList.remove("modal-open");
-            document.body.style.paddingRight = "";
-            document.body.style.overflow = "";
         }
     },
 };
diff --git a/src/components/NotificationDialog.vue b/src/components/NotificationDialog.vue
index dffe2e031..cd001b375 100644
--- a/src/components/NotificationDialog.vue
+++ b/src/components/NotificationDialog.vue
@@ -80,10 +80,6 @@ export default {
     components: {
         Confirm,
     },
-    beforeRouteLeave(to, from, next) {
-        this.cleanupModal();
-        next();
-    },
     props: {},
     emits: [ "added" ],
     data() {
@@ -230,9 +226,6 @@ export default {
                 this.notification.name = this.getUniqueDefaultName(to);
             }
         },
-        $route(to, from) {
-            this.cleanupModal();
-        }
     },
     mounted() {
         this.modal = new Modal(this.$refs.modal);
@@ -358,9 +351,6 @@ export default {
                     console.warn("Modal hide failed:", e);
                 }
             }
-            document.body.classList.remove("modal-open");
-            document.body.style.paddingRight = "";
-            document.body.style.overflow = "";
         }
     },
 };
diff --git a/src/components/ProxyDialog.vue b/src/components/ProxyDialog.vue
index a6f6cce5a..2f7ed7b61 100644
--- a/src/components/ProxyDialog.vue
+++ b/src/components/ProxyDialog.vue
@@ -105,10 +105,6 @@ export default {
     components: {
         Confirm,
     },
-    beforeRouteLeave(to, from, next) {
-        this.cleanupModal();
-        next();
-    },
     props: {},
     emits: [ "added" ],
     data() {
@@ -129,11 +125,6 @@ export default {
             }
         };
     },
-    watch: {
-        $route(to, from) {
-            this.cleanupModal();
-        }
-    },
     mounted() {
         this.modal = new Modal(this.$refs.modal);
     },
@@ -232,9 +223,6 @@ export default {
                     console.warn("Modal hide failed:", e);
                 }
             }
-            document.body.classList.remove("modal-open");
-            document.body.style.paddingRight = "";
-            document.body.style.overflow = "";
         }
     },
 };
diff --git a/src/components/TagsManager.vue b/src/components/TagsManager.vue
index 2cc3549c9..368ea18c2 100644
--- a/src/components/TagsManager.vue
+++ b/src/components/TagsManager.vue
@@ -155,10 +155,6 @@ export default {
         Tag,
         VueMultiselect,
     },
-    beforeRouteLeave(to, from, next) {
-        this.cleanupModal();
-        next();
-    },
     props: {
         /**
          * Array of tags to be pre-selected
@@ -248,11 +244,6 @@ export default {
             };
         },
     },
-    watch: {
-        $route(to, from) {
-            this.cleanupModal();
-        }
-    },
     mounted() {
         this.modal = new Modal(this.$refs.modal);
         this.getExistingTags();
@@ -484,9 +475,6 @@ export default {
                     console.warn("Modal hide failed:", e);
                 }
             }
-            document.body.classList.remove("modal-open");
-            document.body.style.paddingRight = "";
-            document.body.style.overflow = "";
         }
     },
 };