diff --git a/lua/gemini/chat.lua b/lua/gemini/chat.lua
index 9f7c05b..2d6b162 100644
--- a/lua/gemini/chat.lua
+++ b/lua/gemini/chat.lua
@@ -121,16 +121,16 @@ function M.update_content(content, is_new_chat, is_thinking)
     else
         -- For actual messages
         local display_lines = {}
-        local last_message_start_line = 1
+        local current_query_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
+            -- Keep track of where the current query starts
+            if i == #state.conversation_history - 1 then  -- User's query is second-to-last message
+                current_query_line = #display_lines + 1
             end
             -- Add prefix based on role
             local prefix = msg.role == "user" and "User: " or "Assistant: "
@@ -149,8 +149,8 @@ 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})
+            -- Scroll to the current query
+            vim.api.nvim_win_set_cursor(state.winnr, {current_query_line, 0})
             vim.cmd('normal! zt')
         end
     end