diff --git a/docs/getting_started/first_run.md b/docs/getting_started/first_run.md
index aae4736a..7ba0d106 100644
--- a/docs/getting_started/first_run.md
+++ b/docs/getting_started/first_run.md
@@ -20,7 +20,7 @@ cd maxdiffusion
 
 1. Within the root directory of the MaxDiffusion `git` repo, install dependencies by running:
 ```
-# If a Python 3.12+ virtual environment doesn't already exist, you'll need to run the install command twice.
+# If a Python 3.12+ virtual environment doesn't already exist, you'll need to run the install command three times.
 bash setup.sh MODE=stable DEVICE=tpu
 ```
 
diff --git a/setup.sh b/setup.sh
index 24c6b80b..ab81c4a7 100644
--- a/setup.sh
+++ b/setup.sh
@@ -35,7 +35,13 @@ if ! python3 -c 'import sys; assert sys.version_info >= (3, 12)' 2>/dev/null; th
     if [[ $REPLY =~ ^[Yy]$ ]]; then
         # Check if uv is installed first; if not, install uv
         if ! command -v uv &> /dev/null; then
-            pip install uv
+            echo -e "\n'uv' command not found. Installing it now via the official installer..."
+            curl -LsSf https://astral.sh/uv/install.sh | sh
+
+            echo -e "\n\e[33m'uv' has been installed.\e[0m"
+            echo "The installer likely printed instructions to update your shell's PATH."
+            echo "Please open a NEW terminal session (or 'source ~/.bashrc') and re-run this script."
+            exit 1
         fi
         maxdiffusion_dir=$(pwd)
         cd