Hmm, I don't have this issue. Perhaps because I use a two-line prompt?

    export PS1="\n\W\$(parse_git_branch) $ "

    parse_git_branch() { git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/(\1)/'; }