diff --git a/tests/ref/issue-2631-page-header-ordering.png b/tests/ref/issue-2631-page-header-ordering.png
new file mode 100644
index 000000000..5477f68a2
Binary files /dev/null and b/tests/ref/issue-2631-page-header-ordering.png differ
diff --git a/tests/suite/layout/page.typ b/tests/suite/layout/page.typ
index e881bc470..c3576edea 100644
--- a/tests/suite/layout/page.typ
+++ b/tests/suite/layout/page.typ
@@ -238,3 +238,23 @@ Look, ma, no page numbers!
 
 #set page(header: auto, footer: auto)
 Default page numbers now.
+
+--- issue-2631-page-header-ordering ---
+#set text(6pt)
+#show heading: set text(6pt, weight: "regular")
+#set page(
+  margin: (x: 10pt, top: 20pt, bottom: 10pt),
+  height: 50pt,
+  header: context {
+    let prev = query(selector(heading).before(here()))
+    let next = query(selector(heading).after(here()))
+    let prev = if prev != () { prev.last().body }
+    let next = if next != () { next.first().body }
+    (prev: prev, next: next)
+  }
+)
+
+= First
+Hi
+#pagebreak()
+= Second