diff --git a/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatScreen.kt b/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatScreen.kt
index d3f678c4..2af6b913 100644
--- a/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatScreen.kt
+++ b/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatScreen.kt
@@ -524,7 +524,13 @@ fun ChatScreen(
                     FloatingActionButton(
                         onClick = {
                             scrollScope.launch {
-                                listState.animateScrollToItem(state.messages.lastIndex)
+                                val totalItems =
+                                    state.messages.size +
+                                        (if (state.streamingMessage != null) 1 else 0) +
+                                        (if (state.isThinking) 1 else 0)
+                                if (totalItems > 0) {
+                                    listState.animateScrollToItem(totalItems - 1)
+                                }
                             }
                         },
                         modifier = Modifier.size(40.dp),