diff --git a/scripts/common_startup.sh b/scripts/common_startup.sh
index a3dfde519fe..ff9f853bdbf 100755
--- a/scripts/common_startup.sh
+++ b/scripts/common_startup.sh
@@ -241,7 +241,7 @@ if [ $SKIP_CLIENT_BUILD -eq 0 ]; then
     fi
 
     # Build client
-    pushd client
+    cd client
     if yarn install --network-timeout 120000 --check-files; then
         if ! yarn run build-production-maps; then
             echo "ERROR: Galaxy client build failed. See ./client/README.md for more information, including how to get help."
@@ -251,7 +251,7 @@ if [ $SKIP_CLIENT_BUILD -eq 0 ]; then
         echo "ERROR: Galaxy client dependency installation failed. See ./client/README.md for more information, including how to get help."
         exit 1
     fi
-    popd
+    cd -
 else
     echo "Regenerating static plugin directories."
     python ./scripts/plugin_staging.py