diff --git a/website/client/src/components/userMenu/profile.vue b/website/client/src/components/userMenu/profile.vue
index b270d6cf69..51818f9122 100644
--- a/website/client/src/components/userMenu/profile.vue
+++ b/website/client/src/components/userMenu/profile.vue
@@ -863,16 +863,13 @@ export default {
     this.loadUser();
     this.oldTitle = this.$store.state.title;
     this.selectPage(this.startingPage);
-    this.$root.$on('habitica:restoreTitle', () => {
-      if (this.oldTitle) {
-        this.$store.dispatch('common:setTitle', {
-          fullTitle: this.oldTitle,
-        });
-      }
-    });
   },
   beforeDestroy () {
-    this.$root.$off('habitica:restoreTitle');
+    if (this.oldTitle) {
+      this.$store.dispatch('common:setTitle', {
+        fullTitle: this.oldTitle,
+      });
+    }
   },
   methods: {
     async loadUser () {
diff --git a/website/client/src/components/userMenu/profileModal.vue b/website/client/src/components/userMenu/profileModal.vue
index 06b2611cc1..4ed024f163 100644
--- a/website/client/src/components/userMenu/profileModal.vue
+++ b/website/client/src/components/userMenu/profileModal.vue
@@ -5,7 +5,6 @@
     :hide-footer="true"
     :hide-header="true"
     @hide="beforeHide"
-    @hidden="onHidden"
     @shown="onShown()"
   >
     <profile
@@ -55,14 +54,11 @@ export default {
     },
     beforeHide () {
       if (this.$route.path !== window.location.pathname) {
-        this.$root.$emit('habitica:restoreTitle');
-      }
-    },
-    onHidden () {
-      if (this.$route.path !== window.location.pathname) {
-        this.$router.go(-1);
+        this.$router.back();
       }
     },
   },
 };
+
+
 </script>