diff --git a/components/account/AccountCard.vue b/components/account/AccountCard.vue
index 7fb5bac6..f2118fdd 100644
--- a/components/account/AccountCard.vue
+++ b/components/account/AccountCard.vue
@@ -17,6 +17,7 @@ cacheAccount(account)
       shrink
       overflow-hidden
       :to="getAccountRoute(account)"
+      @click="$rememberAccountPosition(getAccountRoute(account).fullPath)"
     />
     <div h-full p1 shrink-0>
       <AccountFollowButton :account="account" />
diff --git a/components/notification/NotificationCard.vue b/components/notification/NotificationCard.vue
index 14e8a74a..d902a301 100644
--- a/components/notification/NotificationCard.vue
+++ b/components/notification/NotificationCard.vue
@@ -4,17 +4,15 @@ import type { mastodon } from 'masto'
 const { notification } = defineProps<{
   notification: mastodon.v1.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)" @click="click">
+      <NuxtLink
+        :to="getAccountRoute(notification.account)"
+        @click="$rememberAccountPosition(getAccountRoute(notification.account).fullPath)"
+      >
         <div
           flex items-center absolute
           ps-3 pe-4 inset-is-0
diff --git a/components/status/StatusCard.vue b/components/status/StatusCard.vue
index b00e2b0d..c8b29362 100644
--- a/components/status/StatusCard.vue
+++ b/components/status/StatusCard.vue
@@ -42,6 +42,7 @@ const statusRoute = $computed(() => getStatusRoute(status))
 
 const el = ref<HTMLElement>()
 const router = useRouter()
+const nuxtApp = useNuxtApp()
 
 function onclick(evt: MouseEvent | KeyboardEvent) {
   const path = evt.composedPath() as HTMLElement[]
@@ -56,7 +57,7 @@ function go(evt: MouseEvent | KeyboardEvent) {
     window.open(statusRoute.href)
   }
   else {
-    useNuxtApp().$rememberStatusPosition(status)
+    nuxtApp.$rememberStatusPosition(status)
     cacheStatus(status)
     router.push(statusRoute)
   }