diff --git a/lua/gemini/init.lua b/lua/gemini/init.lua
index 82b101b..81bcd32 100644
--- a/lua/gemini/init.lua
+++ b/lua/gemini/init.lua
@@ -161,6 +161,10 @@ local function gemini_query(prompt, context)
     -- Store the context for subsequent queries
     current_context = context
     
+    -- Show initial message in chat window
+    local initial_content = "\nUser: " .. prompt .. "\n\nAssistant: Thinking..."
+    update_chat_window(initial_content)
+    
     local response = api.get_response(prompt, context)
     if response then
         local formatted_content = "\nUser: " .. prompt .. "\n\nAssistant: " .. response
@@ -174,6 +178,9 @@ local function gemini_query(prompt, context)
         -- Clear the command line
         vim.cmd('echo ""')
     else
+        -- Update the chat window with error message
+        local error_content = "\nUser: " .. prompt .. "\n\nAssistant: Failed to get response from Gemini API"
+        update_chat_window(error_content)
         vim.notify("Failed to get a response from Gemini API", vim.log.levels.ERROR)
     end
 end