diff --git a/builder/main.py b/builder/main.py
index 2580fa8..7cf8a7f 100644
--- a/builder/main.py
+++ b/builder/main.py
@@ -284,7 +284,7 @@ if upload_protocol == "mbed":
     ]
 elif upload_protocol == "picotool":
     env.Replace(
-        UPLOADER="rp2040load",
+        UPLOADER='"%s"' % join(platform.get_package_dir("tool-rp2040tools") or "", "rp2040load"),
         UPLOADERFLAGS=["-v", "-D"],
         UPLOADCMD="$UPLOADER $UPLOADERFLAGS $SOURCES"
     )
@@ -310,7 +310,6 @@ elif upload_protocol == "picotool":
         # reboot after filesystem upload
         upload_actions.append(env.VerboseAction(RebootPico, "Rebooting device..."))
 
-
     upload_source = target_elf
 
 elif upload_protocol.startswith("jlink"):