diff --git a/src/partials/Notes.svelte b/src/partials/Notes.svelte
index 55ec8bb0..5ef07fb5 100644
--- a/src/partials/Notes.svelte
+++ b/src/partials/Notes.svelte
@@ -1,8 +1,8 @@
 <script>
-  import {sortBy, reject} from 'ramda'
+  import {sortBy, reject, pluck} from 'ramda'
   import {onMount} from 'svelte'
   import {slide} from 'svelte/transition'
-  import {quantify} from 'hurdak/lib/hurdak'
+  import {quantify, createMap} from 'hurdak/lib/hurdak'
   import {createScroller, now} from 'src/util/misc'
   import {findReply} from 'src/util/nostr'
   import Spinner from 'src/partials/Spinner.svelte'
@@ -12,11 +12,28 @@
   export let loadNotes
   export let queryNotes
 
+  let prevNotes = []
+
   const notes = relay.lq(async () => {
     const notes = await queryNotes()
     const annotated = await relay.annotateChunk(notes)
+    const annotatedById = createMap('id', annotated)
 
-    return sortBy(e => -e.created_at, annotated)
+    // Keep sort order intact, more recent replies can cause parent notes
+    // to show up at the top of a feed, but then an early parent date pushes
+    // it to the bottom if we just filter by created_at
+    const sorted = prevNotes
+      .map(id => annotatedById[id])
+      .concat(
+        sortBy(
+          e => -e.created_at,
+          annotated.filter(e => !prevNotes.includes(e.id))
+        )
+      )
+
+    prevNotes = pluck('id', sorted)
+
+    return sorted
   })
 
   let until = now()
diff --git a/src/util/misc.js b/src/util/misc.js
index e38fe3cb..d402021d 100644
--- a/src/util/misc.js
+++ b/src/util/misc.js
@@ -58,7 +58,7 @@ export const createScroller = loadMore => {
     // While we have empty space, fill it
     const {scrollY, innerHeight} = window
     const {scrollHeight} = document.body
-    const shouldLoad = scrollY + innerHeight + 300 > scrollHeight
+    const shouldLoad = scrollY + innerHeight + 800 > scrollHeight
 
     // Only trigger loading the first time we reach the threshhold
     if (shouldLoad && !didLoad) {