diff --git a/roles/home-cli/files/profile b/roles/home-cli/files/profile
index b354b25..ae721a6 100644
--- a/roles/home-cli/files/profile
+++ b/roles/home-cli/files/profile
@@ -81,15 +81,18 @@ then
 elif [ -n "$ZSH_VERSION" ]
 then
 	autoload -Uz compinit && compinit
+	autoload -Uz history-search-end
 	zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}'
+	zle -N history-beginning-search-backward-end history-search-end
+	zle -N history-beginning-search-forward-end history-search-end
 	bindkey -e
 	bindkey "^[[1;5C" forward-word
 	bindkey "^[[1;5D" backward-word
 	bindkey "^[[3~" delete-char
-	bindkey "^[[A" history-beginning-search-backward
-	bindkey "^[[B" history-beginning-search-forward
-	bindkey "^[OA" history-beginning-search-backward
-	bindkey "^[OB" history-beginning-search-forward
+	bindkey "^[[A" history-beginning-search-backward-end
+	bindkey "^[[B" history-beginning-search-forward-end
+	bindkey "^[OA" history-beginning-search-backward-end
+	bindkey "^[OB" history-beginning-search-forward-end
 
 	PS1="%B%n@%m%#%b "