diff --git a/nix/base-system/init.lua b/nix/base-system/init.lua
index 67a8e98..dde334a 100644
--- a/nix/base-system/init.lua
+++ b/nix/base-system/init.lua
@@ -735,7 +735,10 @@ function update_avante_system_prompt()
     end
 end
 
-require('copilot').setup();
+vim.keymap.set("n", "<Leader>ab", function() require('avante').get().file_selector:add_buffer_files() end)
+vim.keymap.set("n", "<Leader>af", function() require('avante').get().file_selector:add_current_buffer() end)
+
+require('copilot').setup()
 
 require('avante').setup({
     provider = "claude",
@@ -754,6 +757,12 @@ require('avante').setup({
     behavior = {
         enable_cursor_planning_mode = true,
     },
+    windows = {
+        ask = {
+            start_insert=false,
+            focus_on_apply="theirs",
+        },
+    },
     system_prompt = make_avante_system_prompt(mcphub.get_hub_instance()),
     custom_tools = { require("mcphub.extensions.avante").mcp_tool() },
     -- Disable these because we'll use the mcphub versions instead