diff --git a/docker-entrypoint b/docker-entrypoint
index 4f9a7c5..fda369d 100755
--- a/docker-entrypoint
+++ b/docker-entrypoint
@@ -27,7 +27,10 @@ else
 	GOSU="gosu builder"
 fi
 
-cd /builder
+if [ "$PWD" = / ]; then
+	cd /builder
+fi
+
 if [ -n "$1" ]; then
 	case "$1" in
 	build|shell|-*)