diff --git a/lua/user/keymaps.lua b/lua/user/keymaps.lua
index 9d3c383..54e2066 100644
--- a/lua/user/keymaps.lua
+++ b/lua/user/keymaps.lua
@@ -29,8 +29,12 @@ keymap("n", "<C-Left>", ":vertical resize -2<CR>", opts)
 keymap("n", "<C-Right>", ":vertical resize +2<CR>", opts)
 
 -- Navigate buffers
-keymap("n", "<M-l>", ":bnext<CR>", opts)
-keymap("n", "<M-h>", ":bprevious<CR>", opts)
+keymap("n", "<M-l>", ":BufferLineCycleNext<CR>", opts)
+keymap("n", "<M-h>", ":BufferLineCyclePrev<CR>", opts)
+keymap("n", "<H>", "<Nop>", opts)
+keymap("n", "<L>", "<Nop>", opts)
+keymap("n", "<M-L>", ":BufferLineMoveNext<CR>", opts)
+keymap("n", "<M-H>", ":BufferLineMovePrev<CR>", opts)
 for _, mode in ipairs({"n", "i", "v"}) do
     vim.keymap.set(mode, '<A-1>', "<Cmd>BufferLineGoToBuffer 1<CR>", { noremap = true, silent = true })
     vim.keymap.set(mode, '<A-2>', "<Cmd>BufferLineGoToBuffer 2<CR>", { noremap = true, silent = true })