diff --git a/packages/tui/internal/components/chat/messages.go b/packages/tui/internal/components/chat/messages.go
index 2d8261e5..9c2dd7e8 100644
--- a/packages/tui/internal/components/chat/messages.go
+++ b/packages/tui/internal/components/chat/messages.go
@@ -393,6 +393,9 @@ func (m *messagesComponent) renderView() {
 
 	m.viewport.SetHeight(m.height - lipgloss.Height(m.header))
 	m.viewport.SetContent("\n" + strings.Join(blocks, "\n\n"))
+	if m.tail {
+		m.viewport.GotoBottom()
+	}
 }
 
 func (m *messagesComponent) renderHeader() string {