diff --git a/src/views/interface/ThemeList.vue b/src/views/interface/ThemeList.vue
index 22d180d7..ce20cb81 100644
--- a/src/views/interface/ThemeList.vue
+++ b/src/views/interface/ThemeList.vue
@@ -338,6 +338,17 @@ export default {
   created() {
     this.loadThemes()
   },
+  destroyed: function() {
+    if (this.visible) {
+      this.visible = false
+    }
+  },
+  beforeRouteLeave(to, from, next) {
+    if (this.visible) {
+      this.visible = false
+    }
+    next()
+  },
   methods: {
     loadThemes() {
       this.themeLoading = true