diff --git a/.config/zsh/.zprofile b/.config/zsh/.zprofile
index 25748f5..2f285aa 100644
--- a/.config/zsh/.zprofile
+++ b/.config/zsh/.zprofile
@@ -67,9 +67,10 @@ if command -v antibody > /dev/null; then
 # robbyrussell/oh-my-zsh path:plugins/history-substring-search
 ${depends_on_fzf}
 zsh-users/zsh-autosuggestions
-zsh-users/zsh-history-substring-search
 mafredri/zsh-async
 zsh-users/zsh-syntax-highlighting
+# Must come after zsh-syntax-highlighting
+zsh-users/zsh-history-substring-search
 EOF
     fi
 else
diff --git a/.config/zsh/zkeys b/.config/zsh/zkeys
index 4a6ae00..687fc8d 100644
--- a/.config/zsh/zkeys
+++ b/.config/zsh/zkeys
@@ -45,6 +45,8 @@ function zle-line-finish () {
 }
 zle -N zle-line-init
 zle -N zle-line-finish
+zle -N history-substring-search-up
+zle -N history-substring-search-down
 
 bindkey '^[[1;5A' history-substring-search-up
 bindkey '^[[1;5B' history-substring-search-down