diff --git a/envsetup.sh b/envsetup.sh
index f050a9a..101ef13 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -922,7 +922,11 @@
 {
     T=$(gettop)
     if [ "$T" ]; then
-        \cd $(gettop)
+        if [ "$1" ]; then
+            \cd $(gettop)/$1
+        else
+            \cd $(gettop)
+        fi
     else
         echo "Couldn't locate the top of the tree.  Try setting TOP."
     fi