diff --git a/init.lua b/init.lua
index 967f158..3cc32c6 100644
--- a/init.lua
+++ b/init.lua
@@ -152,3 +152,6 @@ key("n", "Y", "y$")
 key("i", "<C-Space>", "<C-x><C-o>", { desc = "completion" })
 key("n", "<C-l>", "<cmd>noh<CR><cmd>redraw!<CR>", { desc = "clear search highlight" })
 key("v", "gs", "<cmd>'<,'>sort<CR>", { desc = "sort selection" })
+
+key("n", "<M-b>", "<cmd>bnext<cr>", { desc = "next buffer" })
+key("n", "<M-S-b>", "<cmd>bprevious<cr>", { desc = "previous buffer" })
diff --git a/plugin/on-attach.lua b/plugin/on-attach.lua
index 3d52187..e4bdd11 100644
--- a/plugin/on-attach.lua
+++ b/plugin/on-attach.lua
@@ -25,6 +25,7 @@ local on_attach = function(args)
 		{ '<Leader>D',   vim.lsp.buf.type_definition,                                 "Go to type definition" },
 		{ '<Leader>rn',  vim.lsp.buf.rename,                                          "Rename" },
 		{ '<M-x>',       vim.lsp.buf.code_action,                                     "Code action" },
+		{ '<M-return>',  vim.lsp.buf.code_action,                                     "Code action" },
 		{ '<M-s>',       vim.lsp.codelens.run,                                        "Run code lens" },
 		{ 'gr',          function() require('telescope.builtin').lsp_references() end,"Go to references" },
 		{ '<M-e>',       vim.diagnostic.open_float,                                   "Open diagnostics" },