diff --git a/lua/gemini/chat.lua b/lua/gemini/chat.lua
index b13b51f..45ab353 100644
--- a/lua/gemini/chat.lua
+++ b/lua/gemini/chat.lua
@@ -6,7 +6,7 @@ local state = {
     bufnr = nil,
     winnr = nil,
     current_context = nil,
-    conversation_history = {}  -- Add conversation history to state
+    conversation_history = {}
 }
 
 local function setup_chat_highlighting(bufnr)
@@ -126,6 +126,13 @@ function M.update_content(content, is_new_chat, is_thinking)
     end
 
     if is_new_chat then
+        -- If it's a new chat but we have history, append to existing content
+        if #state.conversation_history > 0 and not is_thinking then
+            local current_lines = vim.api.nvim_buf_get_lines(state.bufnr, 0, -1, false)
+            for i = #current_lines, 1, -1 do
+                table.insert(lines, 1, current_lines[i])
+            end
+        end
         vim.api.nvim_buf_set_lines(state.bufnr, 0, -1, false, lines)
     else
         vim.api.nvim_buf_set_lines(state.bufnr, -1, -1, false, lines)