diff --git a/packages/app/src/Components/Event/Thread.tsx b/packages/app/src/Components/Event/Thread.tsx
index e1914508..44cbffbf 100644
--- a/packages/app/src/Components/Event/Thread.tsx
+++ b/packages/app/src/Components/Event/Thread.tsx
@@ -10,6 +10,7 @@ import BackButton from "@/Components/Button/BackButton";
 import Collapsed from "@/Components/Collapsed";
 import Note from "@/Components/Event/EventComponent";
 import NoteGhost from "@/Components/Event/Note/NoteGhost";
+import ScrollToTop from "@/Components/ScrollToTop";
 import { chainKey } from "@/Utils/Thread/ChainKey";
 import { ThreadContext } from "@/Utils/Thread/ThreadContext";
 import { ThreadContextWrapper } from "@/Utils/Thread/ThreadContextWrapper";
@@ -224,6 +225,7 @@ export function ThreadRoute({ id }: { id?: string }) {
 
   return (
     <ThreadContextWrapper link={link}>
+      <ScrollToTop />
       <Thread />
     </ThreadContextWrapper>
   );
diff --git a/packages/app/src/Components/Feed/TimelineFollows.tsx b/packages/app/src/Components/Feed/TimelineFollows.tsx
index 1109fe17..68c8d8f7 100644
--- a/packages/app/src/Components/Feed/TimelineFollows.tsx
+++ b/packages/app/src/Components/Feed/TimelineFollows.tsx
@@ -35,7 +35,7 @@ const TimelineFollows = (props: TimelineFollowsProps) => {
         discriminator: login.publicKey?.slice(0, 12),
         extra: rb => {
           if (login.tags.item.length > 0) {
-            rb.withFilter().kinds([EventKind.TextNote]).tag("t", login.tags.item);
+            rb.withFilter().kinds([EventKind.TextNote, EventKind.Repost]).tag("t", login.tags.item);
           }
         },
       }) as TimelineSubject,
diff --git a/packages/app/src/Components/ScrollToTop.tsx b/packages/app/src/Components/ScrollToTop.tsx
new file mode 100644
index 00000000..d1adaa13
--- /dev/null
+++ b/packages/app/src/Components/ScrollToTop.tsx
@@ -0,0 +1,12 @@
+import { useEffect } from "react";
+import { useLocation } from "react-router-dom";
+
+export default function ScrollToTop() {
+  const { pathname } = useLocation();
+
+  useEffect(() => {
+    window.scrollTo(0, 0);
+  }, [pathname]);
+
+  return null;
+}
diff --git a/packages/app/src/Pages/Notifications/Notifications.tsx b/packages/app/src/Pages/Notifications/Notifications.tsx
index c6d7e3e1..d7dd613b 100644
--- a/packages/app/src/Pages/Notifications/Notifications.tsx
+++ b/packages/app/src/Pages/Notifications/Notifications.tsx
@@ -15,6 +15,8 @@ import { getNotificationContext } from "./getNotificationContext";
 import { NotificationGroup } from "./NotificationGroup";
 const NotificationGraph = lazy(() => import("@/Pages/Notifications/NotificationChart"));
 
+import ScrollToTop from "@/Components/ScrollToTop";
+
 export default function NotificationsPage({ onClick }: { onClick?: (link: NostrLink) => void }) {
   const login = useLogin();
   const { isMuted } = useModeration();
@@ -51,6 +53,7 @@ export default function NotificationsPage({ onClick }: { onClick?: (link: NostrL
 
   return (
     <>
+      <ScrollToTop />
       <div className="main-content">
         {CONFIG.features.notificationGraph && (
           <Suspense fallback={<PageSpinner />}>