diff --git a/src/components/ProxyDialog.vue b/src/components/ProxyDialog.vue
index fc92359b9..62eb6f2bc 100644
--- a/src/components/ProxyDialog.vue
+++ b/src/components/ProxyDialog.vue
@@ -130,6 +130,27 @@ export default {
         this.modal = new Modal(this.$refs.modal);
     },
 
+    beforeRouteLeave(to, from, next) {
+        if (this.modal) {
+            this.modal.hide();
+        }
+        next();
+    },
+
+    watch: {
+        $route(to, from) {
+            if (this.modal) {
+                this.modal.hide();
+            }
+        }
+    },
+
+    beforeUnmount() {
+        if (this.modal) {
+            this.modal.dispose();
+        }
+    },
+
     methods: {
         /**
          * Show dialog to confirm deletion