diff --git a/lua/opencode/config.lua b/lua/opencode/config.lua
index 9027fb0a..21f5a1e4 100644
--- a/lua/opencode/config.lua
+++ b/lua/opencode/config.lua
@@ -251,7 +251,7 @@ function M.setup(opts)
   M.values = vim.tbl_deep_extend('force', M.values, opts --[[@as OpencodeConfig]])
 
   if opts.default_global_keymaps == false then
-    M.values.keymap.editor = {}
+    M.values.keymap.editor = opts.keymap and opts.keymap.editor or {}
   end
 
   update_keymap_prefix(M.values.keymap_prefix, M.defaults.keymap_prefix)