diff --git a/envsetup.sh b/envsetup.sh
index 3558f142a56..1221e3bad2e 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -705,7 +705,10 @@ function lunch()
         popd > /dev/null
         check_product $product
     else
+        T=$(gettop)
+        pushd $T > /dev/null
         build/tools/roomservice.py $product true
+        popd > /dev/null
     fi
     TARGET_PRODUCT=$product \
     TARGET_BUILD_VARIANT=$variant \