diff --git a/build-home.sh b/build-home.sh
index 9ab1940..4e61d38 100755
--- a/build-home.sh
+++ b/build-home.sh
@@ -67,10 +67,12 @@ step_validate_deps() {
 step_make_skeleton() {
 	# Build Home folder skeleton
 	log "Building skeleton folder layout"
+	pushd "$bootstrapdir"
 	if ! mkdir Desktop Documents Downloads Games Music Pictures Projects Public ROMs System Templates Videos > /dev/null 2>&1; then
 		log "Failed to build skeleton layout" 2
 		return 1
 	fi
+	popd
 	return 0
 }
 step_repo_clone() {