diff --git a/zsh.nix b/zsh.nix
index 3f5d356..39aa839 100644
--- a/zsh.nix
+++ b/zsh.nix
@@ -99,6 +99,12 @@
         fi
 
         bindkey '^ ' autosuggest-accept # Bind CTRL + Space
+        bindkey '^Y' autosuggest-accept # Bind CTRL + Y
+
+        bindkey "$terminfo[kcuu1]" history-substring-search-up
+        bindkey "$terminfo[kcud1]" history-substring-search-down
+        bindkey -M vicmd 'k' history-substring-search-up
+        bindkey -M vicmd 'j' history-substring-search-down
 
         # Extracting
         ex ()