diff --git a/components/notification/NotificationCard.vue b/components/notification/NotificationCard.vue
index 1c5d540e..f906f9c5 100644
--- a/components/notification/NotificationCard.vue
+++ b/components/notification/NotificationCard.vue
@@ -4,12 +4,17 @@ import type { Notification } from 'masto'
 const { notification } = defineProps<{
   notification: Notification
 }>()
+
+const nuxt = useNuxtApp()
+function click() {
+  nuxt.$rememberAccountPosition(getAccountRoute(notification.account).fullPath)
+}
 </script>
 
 <template>
   <article flex flex-col relative>
     <template v-if="notification.type === 'follow'">
-      <NuxtLink :to="getAccountRoute(notification.account)">
+      <NuxtLink :to="getAccountRoute(notification.account)" @click.capture="click">
         <div
           flex items-center absolute
           ps-3 pe-4 inset-is-0
diff --git a/components/status/StatusActions.vue b/components/status/StatusActions.vue
index 7f5cf0b8..7326a56b 100644
--- a/components/status/StatusActions.vue
+++ b/components/status/StatusActions.vue
@@ -30,7 +30,7 @@ const reply = () => {
     focusEditor()
   }
   else {
-    nuxtApp.$rememberScrollPosition(status)
+    nuxtApp.$rememberStatusPosition(status)
     navigateTo({ path: getStatusRoute(status).href, state: { focusReply: true } })
   }
 }
diff --git a/components/status/StatusCard.vue b/components/status/StatusCard.vue
index 8a364aa1..a1b587fd 100644
--- a/components/status/StatusCard.vue
+++ b/components/status/StatusCard.vue
@@ -52,6 +52,7 @@ function go(evt: MouseEvent | KeyboardEvent) {
     window.open(route.href)
   }
   else {
+    useNuxtApp().$rememberStatusPosition(status)
     cacheStatus(status)
     router.push(route)
   }