diff --git a/builder/frameworks/espidf.py b/builder/frameworks/espidf.py
index 6596cfd..7f0934c 100644
--- a/builder/frameworks/espidf.py
+++ b/builder/frameworks/espidf.py
@@ -140,7 +140,7 @@ partition_table = env.Command(
     join(env.subst("$BUILD_DIR"), "partitions_table.bin"),
     join("$ESPIDF_DIR", "components",
          "partition_table", "partitions_singleapp.csv"),
-    '"$PYTHONEXE" %s -q $SOURCE $TARGET' % join(
+    '"$PYTHONEXE" "%s" -q $SOURCE $TARGET' % join(
         "$ESPIDF_DIR", "components", "partition_table", "gen_esp32part.py")
 )
 
diff --git a/builder/main.py b/builder/main.py
index 2e4690e..3c95e4c 100644
--- a/builder/main.py
+++ b/builder/main.py
@@ -113,10 +113,10 @@ env.Replace(
 if env.subst("$PIOFRAMEWORK") == "arduino":
     env.Append(
         UPLOADERFLAGS=[
-            "0x1000", join("$FRAMEWORK_ARDUINOESP32_DIR", "tools",
-                           "sdk", "bin", "bootloader.bin"),
-            "0x4000", join("$FRAMEWORK_ARDUINOESP32_DIR", "tools",
-                           "sdk", "bin", "partitions_singleapp.bin"),
+            "0x1000", '"%s"' % join("$FRAMEWORK_ARDUINOESP32_DIR", "tools",
+                                    "sdk", "bin", "bootloader.bin"),
+            "0x4000", '"%s"' % join("$FRAMEWORK_ARDUINOESP32_DIR", "tools",
+                                    "sdk", "bin", "partitions_singleapp.bin"),
             "0x10000"
         ]
     )