diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e001383..8c9d5bb8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.10.0] - 2024-02-23
+
+### Added
+
+- LSP/Grouped ode actions: Add `<ESC>` keymap to close buffer.
+  This is consistent with the behaviour of the hover actions buffer.
+
 ## [4.9.0] - 2024-02-23
 
 ### Added
diff --git a/lua/rustaceanvim/commands/code_action_group.lua b/lua/rustaceanvim/commands/code_action_group.lua
index 47165e54..d4f88edb 100644
--- a/lua/rustaceanvim/commands/code_action_group.lua
+++ b/lua/rustaceanvim/commands/code_action_group.lua
@@ -191,9 +191,10 @@ local function on_code_action_results(results, ctx)
 
   vim.api.nvim_buf_set_lines(M.state.primary.bufnr, 0, 1, false, {})
 
-  vim.keymap.set('n', '<CR>', on_primary_enter_press, { buffer = M.state.primary.bufnr })
+  vim.keymap.set('n', '<CR>', on_primary_enter_press, { buffer = M.state.primary.bufnr, noremap = true, silent = true })
 
-  vim.keymap.set('n', 'q', on_primary_quit, { buffer = M.state.primary.bufnr })
+  vim.keymap.set('n', 'q', on_primary_quit, { buffer = M.state.primary.bufnr, noremap = true, silent = true })
+  vim.keymap.set('n', '<Esc>', on_primary_quit, { buffer = M.state.primary.bufnr, noremap = true, silent = true })
 
   M.codeactionify_window_buffer(M.state.primary.winnr, M.state.primary.bufnr)