diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15f1f334..1df5c92e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [4.4.1](https://github.com/CopilotC-Nvim/CopilotChat.nvim/compare/v4.4.0...v4.4.1) (2025-08-12)
+
+
+### Bug Fixes
+
+* **chat:** schedule chat initialization after window opens ([#1308](https://github.com/CopilotC-Nvim/CopilotChat.nvim/issues/1308)) ([15eebed](https://github.com/CopilotC-Nvim/CopilotChat.nvim/commit/15eebed57156c3ae6a6bb6f73692dbf0547ba9e4)), closes [#1307](https://github.com/CopilotC-Nvim/CopilotChat.nvim/issues/1307)
+* **prompts:** update tool instructions for system prompt ([#1304](https://github.com/CopilotC-Nvim/CopilotChat.nvim/issues/1304)) ([5e091bf](https://github.com/CopilotC-Nvim/CopilotChat.nvim/commit/5e091bf1bf11827bec5130edc8d4f87fdd243716))
+
 ## [4.4.0](https://github.com/CopilotC-Nvim/CopilotChat.nvim/compare/v4.3.1...v4.4.0) (2025-08-09)
 
 
diff --git a/doc/CopilotChat.txt b/doc/CopilotChat.txt
index 349cdeeb..2c3086ef 100644
--- a/doc/CopilotChat.txt
+++ b/doc/CopilotChat.txt
@@ -1,4 +1,4 @@
-*CopilotChat.txt*          For NVIM v0.8.0         Last change: 2025 August 09
+*CopilotChat.txt*          For NVIM v0.8.0         Last change: 2025 August 12
 
 ==============================================================================
 Table of Contents                              *CopilotChat-table-of-contents*
diff --git a/lua/CopilotChat/config/prompts.lua b/lua/CopilotChat/config/prompts.lua
index 8764f914..44b2f8bd 100644
--- a/lua/CopilotChat/config/prompts.lua
+++ b/lua/CopilotChat/config/prompts.lua
@@ -24,7 +24,7 @@ Think creatively to provide complete solutions based on the information availabl
 Never fabricate or hallucinate file contents you haven't actually seen.
 </instructions>
 <toolUseInstructions>
-If tools are explicitly defined in your system context:
+If tools are explicitly defined in your system prompt:
 - Follow JSON schema precisely when using tools, including all required properties and outputting valid JSON.
 - Use appropriate tools for tasks rather than asking for manual actions.
 - Execute actions directly when you indicate you'll do so, without asking for permission.
@@ -33,7 +33,7 @@ If tools are explicitly defined in your system context:
   1. Resources shared via "# <uri>" headers and referenced via "##<uri>" links
   2. Code blocks with file path labels
   3. Other contextual sharing like selected text or conversation history
-- If you don't have explicit tool definitions in your system context, assume NO tools are available and clearly state this limitation when asked. NEVER pretend to retrieve content you cannot access.
+- If you don't have explicit tool definitions in your system prompt, assume NO tools are available and clearly state this limitation when asked. NEVER pretend to retrieve content you cannot access.
 </toolUseInstructions>
 <editFileInstructions>
 You will receive code snippets that include line number prefixes - use these to maintain correct position references but remove them when generating output.
diff --git a/lua/CopilotChat/init.lua b/lua/CopilotChat/init.lua
index 83a3d0e5..c97359dd 100644
--- a/lua/CopilotChat/init.lua
+++ b/lua/CopilotChat/init.lua
@@ -764,6 +764,9 @@ function M.ask(prompt, config)
 
   vim.diagnostic.reset(vim.api.nvim_create_namespace('copilot-chat-diagnostics'))
   config = vim.tbl_deep_extend('force', M.config, config or {})
+  local schedule = function(cb)
+    return cb()
+  end
 
   -- Stop previous conversation and open window
   if not config.headless then
@@ -774,6 +777,7 @@ function M.ask(prompt, config)
     end
     if not M.chat:focused() then
       M.open(config)
+      schedule = vim.schedule
     end
   else
     update_source()
@@ -783,129 +787,132 @@ function M.ask(prompt, config)
   prompt = insert_sticky(prompt, config)
   prompt = vim.trim(prompt)
 
-  -- Prepare chat
-  if not config.headless then
-    store_sticky(prompt)
-    M.chat:start()
-    M.chat:append('\n')
-  end
+  -- After opening window we need to schedule to next cycle so everything properly resolves
+  schedule(function()
+    -- Prepare chat
+    if not config.headless then
+      store_sticky(prompt)
+      M.chat:start()
+      M.chat:append('\n')
+    end
 
-  -- Resolve prompt references
-  config, prompt = M.resolve_prompt(prompt, config)
-  local system_prompt = config.system_prompt or ''
+    -- Resolve prompt references
+    config, prompt = M.resolve_prompt(prompt, config)
+    local system_prompt = config.system_prompt or ''
 
-  -- Remove sticky prefix
-  prompt = table.concat(
-    vim.tbl_map(function(l)
-      return l:gsub('^>%s+', '')
-    end, vim.split(prompt, '\n')),
-    '\n'
-  )
+    -- Remove sticky prefix
+    prompt = table.concat(
+      vim.tbl_map(function(l)
+        return l:gsub('^>%s+', '')
+      end, vim.split(prompt, '\n')),
+      '\n'
+    )
 
-  -- Retrieve the selection
-  local selection = M.get_selection()
+    -- Retrieve the selection
+    local selection = M.get_selection()
 
-  async.run(handle_error(config, function()
-    local selected_tools, resolved_resources, resolved_tools, prompt = M.resolve_functions(prompt, config)
-    local selected_model, prompt = M.resolve_model(prompt, config)
+    async.run(handle_error(config, function()
+      local selected_tools, resolved_resources, resolved_tools, prompt = M.resolve_functions(prompt, config)
+      local selected_model, prompt = M.resolve_model(prompt, config)
 
-    prompt = vim.trim(prompt)
+      prompt = vim.trim(prompt)
 
-    if not config.headless then
-      utils.schedule_main()
-      local assistant_message = M.chat:get_message(constants.ROLE.ASSISTANT)
-      if assistant_message and assistant_message.tool_calls then
-        local handled_ids = {}
-        for _, tool in ipairs(resolved_tools) do
-          handled_ids[tool.id] = true
-        end
+      if not config.headless then
+        utils.schedule_main()
+        local assistant_message = M.chat:get_message(constants.ROLE.ASSISTANT)
+        if assistant_message and assistant_message.tool_calls then
+          local handled_ids = {}
+          for _, tool in ipairs(resolved_tools) do
+            handled_ids[tool.id] = true
+          end
 
-        -- If we skipped any tool calls, send that as result
-        for _, tool_call in ipairs(assistant_message.tool_calls) do
-          if not handled_ids[tool_call.id] then
-            table.insert(resolved_tools, {
-              id = tool_call.id,
-              result = string.format(BLOCK_OUTPUT_FORMAT, 'error', 'User skipped this function call.'),
-            })
-            handled_ids[tool_call.id] = true
+          -- If we skipped any tool calls, send that as result
+          for _, tool_call in ipairs(assistant_message.tool_calls) do
+            if not handled_ids[tool_call.id] then
+              table.insert(resolved_tools, {
+                id = tool_call.id,
+                result = string.format(BLOCK_OUTPUT_FORMAT, 'error', 'User skipped this function call.'),
+              })
+              handled_ids[tool_call.id] = true
+            end
           end
         end
-      end
 
-      if not utils.empty(resolved_tools) then
-        -- If we are handling tools, replace user message with tool results
-        M.chat:remove_message(constants.ROLE.USER)
-        for _, tool in ipairs(resolved_tools) do
+        if not utils.empty(resolved_tools) then
+          -- If we are handling tools, replace user message with tool results
+          M.chat:remove_message(constants.ROLE.USER)
+          for _, tool in ipairs(resolved_tools) do
+            M.chat:add_message({
+              id = tool.id,
+              role = constants.ROLE.TOOL,
+              tool_call_id = tool.id,
+              content = '\n' .. tool.result .. '\n',
+            })
+          end
+        else
+          -- Otherwise just replace the user message with resolved prompt
           M.chat:add_message({
-            id = tool.id,
-            role = constants.ROLE.TOOL,
-            tool_call_id = tool.id,
-            content = '\n' .. tool.result .. '\n',
-          })
+            role = constants.ROLE.USER,
+            content = '\n' .. prompt .. '\n',
+          }, true)
         end
-      else
-        -- Otherwise just replace the user message with resolved prompt
-        M.chat:add_message({
-          role = constants.ROLE.USER,
-          content = '\n' .. prompt .. '\n',
-        }, true)
       end
-    end
 
-    if utils.empty(prompt) and utils.empty(resolved_tools) then
-      if not config.headless then
-        M.chat:remove_message(constants.ROLE.USER)
-        finish()
-      end
-      return
-    end
-
-    local ask_response = client.ask(client, prompt, {
-      headless = config.headless,
-      history = M.chat.messages,
-      selection = selection,
-      resources = resolved_resources,
-      tools = selected_tools,
-      system_prompt = system_prompt,
-      model = selected_model,
-      temperature = config.temperature,
-      on_progress = vim.schedule_wrap(function(message)
+      if utils.empty(prompt) and utils.empty(resolved_tools) then
         if not config.headless then
-          M.chat:add_message(message)
+          M.chat:remove_message(constants.ROLE.USER)
+          finish()
         end
-      end),
-    })
+        return
+      end
 
-    -- If there was no error and no response, it means job was cancelled
-    if ask_response == nil then
-      return
-    end
+      local ask_response = client.ask(client, prompt, {
+        headless = config.headless,
+        history = M.chat.messages,
+        selection = selection,
+        resources = resolved_resources,
+        tools = selected_tools,
+        system_prompt = system_prompt,
+        model = selected_model,
+        temperature = config.temperature,
+        on_progress = vim.schedule_wrap(function(message)
+          if not config.headless then
+            M.chat:add_message(message)
+          end
+        end),
+      })
 
-    local response = ask_response.message
-    local token_count = ask_response.token_count
-    local token_max_count = ask_response.token_max_count
+      -- If there was no error and no response, it means job was cancelled
+      if ask_response == nil then
+        return
+      end
 
-    -- Call the callback function
-    if config.callback then
-      utils.schedule_main()
-      config.callback(response.content, state.source)
-    end
+      local response = ask_response.message
+      local token_count = ask_response.token_count
+      local token_max_count = ask_response.token_max_count
 
-    if not config.headless then
-      response.content = vim.trim(response.content)
-      if utils.empty(response.content) then
-        response.content = ''
-      else
-        response.content = '\n' .. response.content .. '\n'
+      -- Call the callback function
+      if config.callback then
+        utils.schedule_main()
+        config.callback(response.content, state.source)
       end
 
-      utils.schedule_main()
-      M.chat:add_message(response, true)
-      M.chat.token_count = token_count
-      M.chat.token_max_count = token_max_count
-      finish()
-    end
-  end))
+      if not config.headless then
+        response.content = vim.trim(response.content)
+        if utils.empty(response.content) then
+          response.content = ''
+        else
+          response.content = '\n' .. response.content .. '\n'
+        end
+
+        utils.schedule_main()
+        M.chat:add_message(response, true)
+        M.chat.token_count = token_count
+        M.chat.token_max_count = token_max_count
+        finish()
+      end
+    end))
+  end)
 end
 
 --- Stop current copilot output and optionally reset the chat ten show the help message.
diff --git a/version.txt b/version.txt
index fdc66988..cca25a93 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-4.4.0
+4.4.1