diff --git a/lua/gemini/chat.lua b/lua/gemini/chat.lua
index 8643fba..9f7c05b 100644
--- a/lua/gemini/chat.lua
+++ b/lua/gemini/chat.lua
@@ -121,12 +121,17 @@ function M.update_content(content, is_new_chat, is_thinking)
     else
         -- For actual messages
         local display_lines = {}
+        local last_message_start_line = 1
         
         -- Add all messages from history
         for i, msg in ipairs(state.conversation_history) do
             if i > 1 then  -- Add separator before messages (except first)
                 table.insert(display_lines, "━━━━━━━━━━━━━━━━━━━━━━━━━━")
             end
+            -- Keep track of where the last message starts
+            if i == #state.conversation_history then
+                last_message_start_line = #display_lines + 1
+            end
             -- Add prefix based on role
             local prefix = msg.role == "user" and "User: " or "Assistant: "
             local first_line = true
@@ -144,14 +149,13 @@ function M.update_content(content, is_new_chat, is_thinking)
         -- Set the buffer content
         if #display_lines > 0 then
             vim.api.nvim_buf_set_lines(state.bufnr, 0, -1, false, display_lines)
+            -- Scroll to the start of the last message
+            vim.api.nvim_win_set_cursor(state.winnr, {last_message_start_line, 0})
+            vim.cmd('normal! zt')
         end
     end
 
     vim.api.nvim_buf_set_option(state.bufnr, 'modifiable', false)
-
-    -- Scroll to show new content
-    vim.api.nvim_win_set_cursor(state.winnr, {1, 0})
-    vim.cmd('normal! zt')
     vim.cmd('wincmd p')
 end