diff --git a/nvim/.config/nvim/after/plugin/which-key.lua b/nvim/.config/nvim/after/plugin/which-key.lua
new file mode 100644
index 0000000..c2bbf6c
--- /dev/null
+++ b/nvim/.config/nvim/after/plugin/which-key.lua
@@ -0,0 +1 @@
+require("which-key").setup {}
diff --git a/nvim/.config/nvim/after/plugin/which_key.lua b/nvim/.config/nvim/after/plugin/which_key.lua
deleted file mode 100644
index f0c2528..0000000
--- a/nvim/.config/nvim/after/plugin/which_key.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-local remap = vim.api.nvim_set_keymap
-
-vim.g.which_key_use_floating_win = 1
-
-remap('n', '<Leader>', ':<C-U>WhichKey \'<Space>\'<CR>', { noremap = true, silent = true })
-remap('n', '<LocalLeader>', ':<C-U>WhichKey \',\'<CR>',  { noremap = true, silent = true })
diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua
index 65ff312..58fe407 100644
--- a/nvim/.config/nvim/lua/plugins.lua
+++ b/nvim/.config/nvim/lua/plugins.lua
@@ -62,7 +62,7 @@ local init = function ()
   -- Directory viewer
   use 'justinmk/vim-dirvish'
   -- Show leader key bindings
-  use 'liuchengxu/vim-which-key'
+  use 'folke/which-key.nvim'
   -- Toggle terminal
   use 'voldikss/vim-floaterm'
   -- Take care of sudo