diff --git a/modules/history-substring-search/init.zsh b/modules/history-substring-search/init.zsh
index 933b07c..2d8ea43 100644
--- a/modules/history-substring-search/init.zsh
+++ b/modules/history-substring-search/init.zsh
@@ -8,3 +8,8 @@ source ${0:h}/external/zsh-history-substring-search.zsh || return 1
 # Binding ^[[A/^[[B manually mean up/down works with history-substring-search both before and after zle-line-init
 bindkey '^[[A' history-substring-search-up
 bindkey '^[[B' history-substring-search-down
+
+# Bind up and down keys
+zmodload -F zsh/terminfo +p:terminfo
+bindkey "${terminfo[kcuu1]}" history-substring-search-up
+bindkey "${terminfo[kcud1]}" history-substring-search-down