diff --git a/zsh/zshrc.d/20_aliases.sh b/zsh/zshrc.d/20_aliases.sh
index 5b24ed9..3d8eede 100644
--- a/zsh/zshrc.d/20_aliases.sh
+++ b/zsh/zshrc.d/20_aliases.sh
@@ -289,10 +289,15 @@ clip() {
 
 gb() {
     _superproject="$(git rev-parse --show-superproject-working-tree)"
+    _root="$(git rev-parse --show-toplevel)"
     if [[ -n "${_superproject}" ]] ; then
-        builtin cd "${_superproject}"
+        if [[ "$(pwd)" == "${_root}" ]] ; then
+            builtin cd "${_superproject}"
+        else
+            builtin cd "${_root}"
+        fi
     else
-        builtin cd "$(git rev-parse --show-toplevel)"
+        builtin cd "${_root}"
     fi
 }