diff --git a/users/common/programs/nvim/nixvim/options.nix b/users/common/programs/nvim/nixvim/options.nix
index 6c8674a..4f82df0 100644
--- a/users/common/programs/nvim/nixvim/options.nix
+++ b/users/common/programs/nvim/nixvim/options.nix
@@ -70,11 +70,11 @@
     smartindent = true;
 
     # Only wait 20 milliseconds for characters to arrive (see :help timeout)
-    timeoutlen = 20;
+    timeoutlen = 500; # wait for whichkey
     ttimeoutlen = 20;
 
     # Disable timeout, set ttimeout (only timeout on keycodes)
-    timeout = false;
+    timeout = true;
     ttimeout = true;
 
     # replace grep with ripgrep
diff --git a/users/common/programs/nvim/nixvim/plugins.nix b/users/common/programs/nvim/nixvim/plugins.nix
index c0cfbc3..0cae44c 100644
--- a/users/common/programs/nvim/nixvim/plugins.nix
+++ b/users/common/programs/nvim/nixvim/plugins.nix
@@ -7,6 +7,7 @@
   ];
   programs.nixvim.plugins = {
     web-devicons.enable = true;
+    which-key.enable = true;
     lualine = {
       enable = true;
       settings = {