diff --git a/frontend/src/views/WorkspaceView.vue b/frontend/src/views/WorkspaceView.vue
index 106ad41..139bc75 100644
--- a/frontend/src/views/WorkspaceView.vue
+++ b/frontend/src/views/WorkspaceView.vue
@@ -115,6 +115,7 @@ function scrollToBottom() {
 }
 
 watch(() => chatStore.streamingContent, scrollToBottom);
+watch(() => chatStore.currentConversation?.messages.length, scrollToBottom);
 
 function togglePanel(panel: keyof typeof panelOpen.value) {
   const open = panelOpen.value;