diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua
index 05e76c9..e806e04 100644
--- a/lua/config/keymaps.lua
+++ b/lua/config/keymaps.lua
@@ -21,12 +21,18 @@ keymap("n", "<H>", "<Nop>", opts)
 keymap("n", "<L>", "<Nop>", opts)
 keymap("n", "<M-L>", ":BufferLineMoveNext<CR>", opts)
 keymap("n", "<M-H>", ":BufferLineMovePrev<CR>", opts)
+
+function go_to_buffer(buffer)
+  return function()
+    require("bufferline").go_to(buffer, true)
+  end
+end
+
 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 })
-  vim.keymap.set(mode, "<A-3>", "<Cmd>BufferLineGoToBuffer 3<CR>", { noremap = true, silent = true })
-  vim.keymap.set(mode, "<A-4>", "<Cmd>BufferLineGoToBuffer 4<CR>", { noremap = true, silent = true })
-  vim.keymap.set(mode, "<A-5>", "<Cmd>BufferLineGoToBuffer 5<CR>", { noremap = true, silent = true })
+  for i = 1, 8 do
+    vim.keymap.set(mode, "<A-" .. i .. ">", go_to_buffer(i), { noremap = true, silent = true })
+  end
+  vim.keymap.set(mode, "<A-9>", go_to_buffer(-1), { noremap = true, silent = true })
 end
 
 -- Clear highlights
diff --git a/lua/plugins/core.lua b/lua/plugins/core.lua
index a65f38d..2decc7f 100644
--- a/lua/plugins/core.lua
+++ b/lua/plugins/core.lua
@@ -7,6 +7,7 @@ return {
       win = {
         border = "single",
       },
+      delay = 1000,
     },
   },
   {
diff --git a/lua/plugins/noice.lua b/lua/plugins/noice.lua
index 5d94886..7c7818a 100644
--- a/lua/plugins/noice.lua
+++ b/lua/plugins/noice.lua
@@ -1,5 +1,6 @@
 return {
   "folke/noice.nvim",
+  commit = "d9328ef",
   enabled = true,
   opts = {
     cmdline = {