autoload -U history-search-end
zle -N history-beginning-search-backward-end history-search-end
zle -N history-beginning-search-forward-end history-search-end
bindkey "^[[A" history-beginning-search-backward-end
bindkey "^[[B" history-beginning-search-forward-end

beginning-history-incremental-pattern-search-backward() {
    zle history-incremental-pattern-search-backward ${BUFFER:gs/ /*/}
}
zle -N beginning-history-incremental-pattern-search-backward
bindkey "^[[1;2A" beginning-history-incremental-pattern-search-backward
bindkey -M isearch "^[[A" history-incremental-pattern-search-backward
bindkey -M isearch "^[[B" history-incremental-pattern-search-forward