diff --git a/lua/gemini/chat.lua b/lua/gemini/chat.lua
index 3b67cd2..f74e84d 100644
--- a/lua/gemini/chat.lua
+++ b/lua/gemini/chat.lua
@@ -116,45 +116,32 @@ function M.update_content(content, is_new_chat, is_thinking)
     local lines = vim.split(content, "\n")
 
     if is_thinking then
-        -- For thinking message, just replace/append without affecting history
+        -- For thinking message, just replace content
         vim.api.nvim_buf_set_lines(state.bufnr, 0, -1, false, lines)
     else
-        if is_new_chat then
-            -- For new messages, show the complete history
-            local display_lines = {}
-            for i, msg in ipairs(state.conversation_history) do
-                if i > 1 then  -- Add separator before messages (except first)
-                    table.insert(display_lines, "━━━━━━━━━━━━━━━━━━━━━━━━━━")
-                end
-                local msg_lines = vim.split(msg.content, "\n")
-                for _, line in ipairs(msg_lines) do
-                    table.insert(display_lines, line)
-                end
-            end
-            -- Add the new content
-            if #state.conversation_history > 0 then
+        -- For actual messages
+        local display_lines = {}
+        
+        -- 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
-            for _, line in ipairs(lines) do
+            local msg_lines = vim.split(msg.content, "\n")
+            for _, line in ipairs(msg_lines) do
                 table.insert(display_lines, line)
             end
-            vim.api.nvim_buf_set_lines(state.bufnr, 0, -1, false, display_lines)
-        else
-            -- For subsequent messages in the same chat
-            if #state.conversation_history > 0 then
-                table.insert(lines, 1, "━━━━━━━━━━━━━━━━━━━━━━━━━━")
-            end
-            vim.api.nvim_buf_set_lines(state.bufnr, -1, -1, false, lines)
         end
+
+        -- Set the buffer content
+        vim.api.nvim_buf_set_lines(state.bufnr, 0, -1, false, display_lines)
     end
 
     vim.api.nvim_buf_set_option(state.bufnr, 'modifiable', false)
 
     -- Scroll to show new content
     local line_count = vim.api.nvim_buf_line_count(state.bufnr)
-    local content_lines = #vim.split(content, "\n")
-    local start_line = line_count - content_lines + 1
-    vim.api.nvim_win_set_cursor(state.winnr, {start_line, 0})
+    vim.api.nvim_win_set_cursor(state.winnr, {1, 0})
     vim.cmd('normal! zt')
     vim.cmd('wincmd p')
 end