diff --git a/src/components/ChatViewer.tsx b/src/components/ChatViewer.tsx
index 6f3a1ab..01d991e 100644
--- a/src/components/ChatViewer.tsx
+++ b/src/components/ChatViewer.tsx
@@ -836,6 +836,7 @@ export function ChatViewer({
             data={messagesWithMarkers}
             initialTopMostItemIndex={messagesWithMarkers.length - 1}
             followOutput="smooth"
+            alignToBottom
             components={{
               Header: () =>
                 hasMore && conversationResult.status === "success" ? (
@@ -857,6 +858,7 @@ export function ChatViewer({
                     </Button>
                   </div>
                 ) : null,
+              Footer: () => <div className="h-1" />,
             }}
             itemContent={(_index, item) => {
               if (item.type === "day-marker") {