diff --git a/lua/plugins/astrocore.lua b/lua/plugins/astrocore.lua
index 6d2070b..58fc8e8 100644
--- a/lua/plugins/astrocore.lua
+++ b/lua/plugins/astrocore.lua
@@ -400,7 +400,7 @@ return {
           desc = "Find Service files",
         },
         -- AI/Assistant mappings
-        ["<C-a>c"] = { terminals.claude_toggle, desc = "Claude Toggle" },
+        ["<C-a><C-a>"] = { terminals.claude_toggle, desc = "Claude Toggle" },
       },
       i = {
         ["<C-c>"] = { "<Cmd>wa<CR><Cmd>bd<CR><Esc>", desc = "Save, close buffer, and return to normal mode" },
@@ -418,6 +418,14 @@ return {
           desc = "Find buffers",
         },
         -- Exit terminal mode and close window
+        ["<C-q>"] = {
+          function()
+            vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes([[<C-\><C-n>]], true, false, true), "n", false)
+            vim.cmd "close"
+          end,
+          desc = "Exit terminal and close window",
+        },
+        -- Exit terminal mode and close window
         ["<C-c>"] = {
           function()
             vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes([[<C-\><C-n>]], true, false, true), "n", false)