diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua
new file mode 100644
index 00000000..17b7703c
--- /dev/null
+++ b/home/.config/nvim/lua/plugins/which-key.lua
@@ -0,0 +1,19 @@
+return function()
+    require('which-key').setup {spelling = {enabled = true}}
+    ---PATCH from https://github.com/folke/which-key.nvim/pull/305
+    local wk_view = require 'which-key.view'
+    wk_view.hide = function()
+        vim.api.nvim_echo({{""}}, false, {})
+        vim.cmd 'redraw'
+        wk_view.hide_cursor()
+        if wk_view.buf and vim.api.nvim_buf_is_valid(wk_view.buf) then
+            vim.api.nvim_buf_delete(wk_view.buf, {force = true})
+            wk_view.buf = nil
+        end
+        if wk_view.win and vim.api.nvim_win_is_valid(wk_view.win) then
+            vim.api.nvim_win_close(wk_view.win, {force = true})
+            wk_view.win = nil
+        end
+    end
+    ---ENDPATCH
+end