diff --git a/.config/zsh/zshrc.d/30-alias.zsh b/.config/zsh/zshrc.d/30-alias.zsh
index da182a0..a16f5c6 100644
--- a/.config/zsh/zshrc.d/30-alias.zsh
+++ b/.config/zsh/zshrc.d/30-alias.zsh
@@ -34,10 +34,10 @@
 	alias gss='git stash'
 	# https://nilansanjaya.wordpress.com/2017/06/02/git-find-base-branch/
 	git_bb='git show-branch -a 2>/dev/null'
-	git_bb+=' | grep "\*"'
-	git_bb+=' | grep -v "$(git rev-parse --abbrev-ref HEAD)"'
+	git_bb+=' | grep "^[^[]*\*"'
+	git_bb+=' | grep -v "^[^[]*\[$(git rev-parse --abbrev-ref HEAD)\]"'
 	git_bb+=' | head -n1'
-	git_bb+=' | sed -E "s/^.*\[([^^~\]*)([~^].*)?\].*$/\1/"'
+	git_bb+=' | sed -E "s/^[^[]*\[([^]~^]*).*$/\1/"'
 	alias git-base-branch="$git_bb"
 	unset git_bb
 	# https://stackoverflow.com/a/1549155