diff --git a/plugins/by-name/copilot-chat/default.nix b/plugins/by-name/copilot-chat/default.nix
index 7d0ed715..3156c148 100644
--- a/plugins/by-name/copilot-chat/default.nix
+++ b/plugins/by-name/copilot-chat/default.nix
@@ -258,6 +258,7 @@ helpers.neovim-plugin.mkNeovimPlugin {
     mappings =
       helpers.defaultNullOpts.mkAttrsOf
         (types.submodule {
+          freeformType = with types; attrsOf anything;
           options = {
             normal = helpers.mkNullOrStr "Key for normal mode.";
 
@@ -267,10 +268,7 @@ helpers.neovim-plugin.mkNeovimPlugin {
           };
         })
         {
-          complete = {
-            detail = "Use @<Tab> or /<Tab> for options.";
-            insert = "<Tab>";
-          };
+          complete.insert = "<Tab>";
           close = {
             normal = "q";
             insert = "<C-c>";
@@ -281,16 +279,26 @@ helpers.neovim-plugin.mkNeovimPlugin {
           };
           submit_prompt = {
             normal = "<CR>";
-            insert = "<C-m>";
+            insert = "<C-s>";
+          };
+          toggle_sticky = {
+            detail = "Makes line under cursor sticky or deletes sticky line.";
+            normal = "gr";
           };
           accept_diff = {
             normal = "<C-y>";
             insert = "<C-y>";
           };
-          yank_diff.normal = "gy";
+          jump_to_diff.normal = "gj";
+          quickfix_diffs.normal = "gq";
+          yank_diff = {
+            normal = "gy";
+            register = "\"";
+          };
           show_diff.normal = "gd";
-          show_system_prompt.normal = "gp";
-          show_user_selection.normal = "gs";
+          show_info.normal = "gi";
+          show_context.normal = "gc";
+          show_help.normal = "gh";
         }
         "Mappings for CopilotChat.";
   };
diff --git a/tests/test-sources/plugins/by-name/copilot-chat/default.nix b/tests/test-sources/plugins/by-name/copilot-chat/default.nix
index b8c74e45..98471d1f 100644
--- a/tests/test-sources/plugins/by-name/copilot-chat/default.nix
+++ b/tests/test-sources/plugins/by-name/copilot-chat/default.nix
@@ -79,10 +79,7 @@
           zindex = 1;
         };
         mappings = {
-          complete = {
-            detail = "Use @<Tab> or /<Tab> for options.";
-            insert = "<Tab>";
-          };
+          complete.insert = "<Tab>";
           close = {
             normal = "q";
             insert = "<C-c>";
@@ -93,16 +90,26 @@
           };
           submit_prompt = {
             normal = "<CR>";
-            insert = "<C-m>";
+            insert = "<C-s>";
+          };
+          toggle_sticky = {
+            detail = "Makes line under cursor sticky or deletes sticky line.";
+            normal = "gr";
           };
           accept_diff = {
             normal = "<C-y>";
             insert = "<C-y>";
           };
-          yank_diff.normal = "gy";
+          jump_to_diff.normal = "gj";
+          quickfix_diffs.normal = "gq";
+          yank_diff = {
+            normal = "gy";
+            register = "\"";
+          };
           show_diff.normal = "gd";
-          show_system_prompt.normal = "gp";
-          show_user_selection.normal = "gs";
+          show_info.normal = "gi";
+          show_context.normal = "gc";
+          show_help.normal = "gh";
         };
       };
     };
@@ -158,8 +165,8 @@
           };
           yank_diff.normal = "gmy";
           show_diff.normal = "gmd";
-          show_system_prompt.normal = "gmp";
-          show_user_selection.normal = "gms";
+          show_info.normal = "gmp";
+          show_context.normal = "gms";
         };
       };
     };