2 files changed, 3 insertions, 3 deletions
diff --git a/packages/ui/src/components/message-nav.tsx b/packages/ui/src/components/message-nav.tsx
index 29b465c8c..a2db11348 100644
--- a/packages/ui/src/components/message-nav.tsx
+++ b/packages/ui/src/components/message-nav.tsx
@@ -15,7 +15,7 @@ export function MessageNav(
 ) {
   const [local, others] = splitProps(props, ["messages", "current", "size", "working", "onMessageSelect"])
   const lastUserMessage = createMemo(() => {
-    return local.messages?.at(0)
+    return local.messages?.at(-1)
   })
 
   const content = () => (
diff --git a/packages/ui/src/components/session-turn.tsx b/packages/ui/src/components/session-turn.tsx
index 5e73c6772..f97a3224c 100644
--- a/packages/ui/src/components/session-turn.tsx
+++ b/packages/ui/src/components/session-turn.tsx
@@ -42,10 +42,10 @@ export function SessionTurn(
   const userMessages = createMemo(() =>
     messages()
       .filter((m) => m.role === "user")
-      .sort((a, b) => b.id.localeCompare(a.id)),
+      .sort((a, b) => a.id.localeCompare(b.id)),
   )
   const lastUserMessage = createMemo(() => {
-    return userMessages()?.at(0)
+    return userMessages()?.at(-1)
   })
   const message = createMemo(() => userMessages()?.find((m) => m.id === props.messageID))