diff --git a/README.md b/README.md
index bd1b4a33..4696952c 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 Bugs
 
+- [ ] Make sure to stop loading chunks on component unmount
 - [ ] Don't lose scroll position when opening modals
 - [ ] Optimistically load events the user publishes (e.g. to reduce reflow for reactions/replies). Essentially, we can pretend to be our own in-memory relay.
 
diff --git a/src/App.svelte b/src/App.svelte
index 1428b273..d75915da 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -34,6 +34,7 @@
   const toggleSearch = () => searchIsOpen.update(x => !x)
 
   let menuIcon
+  let scrollY
 
   export let url = ""
 
@@ -45,6 +46,18 @@
       }
     })
 
+    modal.subscribe($modal => {
+      if ($modal) {
+        scrollY = window.scrollY
+
+        document.body.style.top = `-${scrollY}px`
+        document.body.style.position = `fixed`
+      } else {
+        document.body.style = ''
+        window.scrollTo(0, scrollY)
+      }
+    })
+
     globalHistory.listen(() => {
       modal.set(null)
     })
@@ -55,7 +68,7 @@
 
 <Router {url}>
   <div use:links class="h-full">
-    <div class="pt-16 text-white h-full" class:overflow-hidden={$modal}>
+    <div class="pt-16 text-white h-full">
       <Route path="/notes" component={Notes} />
       <Route path="/notes/new" component={NoteCreate} />
       <Route path="/chat" component={Chat} />
diff --git a/src/state/app.js b/src/state/app.js
index f5039bbc..00a5ed04 100644
--- a/src/state/app.js
+++ b/src/state/app.js
@@ -64,11 +64,13 @@ export const ensureAccounts = async (pubkeys, {force = false} = {}) => {
 // Notes
 
 export const annotateNotesChunk = async (chunk, {showParents = false} = {}) => {
-  if (showParents) {
+  const parentIds = chunk.map(findReply).filter(identity)
+
+  if (showParents && parentIds.length) {
     // Find parents of replies to provide context
     const parents = await _channels.getter.all({
       kinds: [1],
-      ids: chunk.map(findReply).filter(identity),
+      ids: parentIds,
     })
 
     // Remove replies, show parents instead
@@ -133,7 +135,31 @@ export const notesCursor = async (
     {kinds: [1, 5, 7], since: now()},
     e => switcherFn(e.kind, {
       1: async () => {
-        if (filterMatches(filter, e)) {
+        const replyId = findReply(e)
+
+        if (replyId) {
+          const [annotated] = await annotateNotesChunk([e])
+
+          notes.update($notes =>
+            $notes
+              .map(n => {
+                if (n.id === replyId) {
+                  return {...n, replies: [...n.replies, annotated]}
+                }
+
+                return {
+                  ...n,
+                  replies: n.replies.map(r => {
+                    if (r.id === replyId) {
+                      return {...r, replies: [...r.replies, annotated]}
+                    }
+
+                    return r
+                  }),
+                }
+              })
+          )
+        } else if (filterMatches(filter, e)) {
           addChunk(await annotateNotesChunk([e], {showParents}))
         }
       },
@@ -151,19 +177,19 @@ export const notesCursor = async (
         )
       },
       7: () => {
-        const id = findReply(e)
+        const replyId = findReply(e)
 
         notes.update($notes =>
           $notes
             .map(n => {
-              if (n.id === id) {
+              if (n.id === replyId) {
                 return {...n, reactions: [...n.reactions, e]}
               }
 
               return {
                 ...n,
                 replies: n.replies.map(r => {
-                  if (r.id === id) {
+                  if (r.id === replyId) {
                     return {...r, reactions: [...r.reactions, e]}
                   }
 
@@ -177,13 +203,14 @@ export const notesCursor = async (
   )
 
   const loadChunk = async () => {
-    const chunk = await annotateNotesChunk(await cursor.chunk(), {showParents})
+    const chunk = await cursor.chunk()
+    const annotatedChunk = await annotateNotesChunk(chunk, {showParents})
 
-    addChunk(chunk)
+    addChunk(annotatedChunk)
 
     // If we have an empty chunk, increase our step size so we can get back to where
     // we might have old events. Once we get a chunk, knock it down to the default again
-    if (chunk.length === 0) {
+    if (annotatedChunk.length === 0) {
       cursor.delta = Math.min(timedelta(30, 'days'), cursor.delta * 2)
     } else {
       cursor.delta = delta