diff --git a/src/win/common.bat b/src/win/common.bat
index b42f240..fecc1ae 100644
--- a/src/win/common.bat
+++ b/src/win/common.bat
@@ -1,19 +1,19 @@
 @echo off
 
-SET MYPATH=%~dp0
+SET "MYPATH=%~dp0"
 
 set ProgramFiles64=%ProgramFiles: (x86)=%
-set I2PData="%LocalAppData%\I2P\"
+set "I2PData=%LocalAppData%\I2P\"
 
 set I2PPath="%ProgramFiles%\I2P\"
 if exist "%LocalAppData%\I2P\I2P.exe" (
-  set I2PPath="%LocalAppData%\I2P\"
+  set "I2PPath=%LocalAppData%\I2P\"
 )
 
 if exist "%ProgramFiles64%\I2P\" (
-  set I2PPath="%ProgramFiles64%\I2P\"
+  set "I2PPath=%ProgramFiles64%\I2P\"
 )
 
 if exist "%ProgramFiles(x86)%\I2P" (
-  set I2PPath="%ProgramFiles(x86)%\I2P\"
+  set "I2PPath=%ProgramFiles(x86)%\I2P\"
 )
diff --git a/src/win/copy-config-profile.bat b/src/win/copy-config-profile.bat
index 6691ee8..c998d16 100644
--- a/src/win/copy-config-profile.bat
+++ b/src/win/copy-config-profile.bat
@@ -1,5 +1,5 @@
 
-SET MYPATH=%~dp0
+SET "MYPATH=%~dp0"
 call "%MYPATH%common.bat"
 
 if exist "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.config.i2p\" (
diff --git a/src/win/copy-profile.bat b/src/win/copy-profile.bat
index 490303b..1c21b20 100644
--- a/src/win/copy-profile.bat
+++ b/src/win/copy-profile.bat
@@ -1,5 +1,5 @@
 
-SET MYPATH=%~dp0
+SET "MYPATH=%~dp0"
 call "%MYPATH%common.bat"
 
 if exist "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p\" (
diff --git a/src/win/i2pbrowser-private.bat b/src/win/i2pbrowser-private.bat
index 5ac87b7..22f16b2 100644
--- a/src/win/i2pbrowser-private.bat
+++ b/src/win/i2pbrowser-private.bat
@@ -1,6 +1,6 @@
 @echo on
 
-SET MYPATH=%~dp0
+SET "MYPATH=%~dp0"
 call "%MYPATH%common.bat"
 
 call "%MYPATH%launchi2p.bat"
diff --git a/src/win/i2pbrowser.bat b/src/win/i2pbrowser.bat
index 0984207..529aff6 100644
--- a/src/win/i2pbrowser.bat
+++ b/src/win/i2pbrowser.bat
@@ -1,6 +1,6 @@
 @echo on
 
-SET MYPATH=%~dp0
+SET "MYPATH=%~dp0"
 call "%MYPATH%common.bat"
 
 call "%MYPATH%launchi2p.bat"
diff --git a/src/win/i2pconfig.bat b/src/win/i2pconfig.bat
index 14fec7a..b7b6f3f 100644
--- a/src/win/i2pconfig.bat
+++ b/src/win/i2pconfig.bat
@@ -1,6 +1,6 @@
 @echo off
 
-SET MYPATH=%~dp0
+SET "MYPATH=%~dp0"
 call "%MYPATH%common.bat"
 
 call "%MYPATH%copy-config-profile.bat"
diff --git a/src/win/launchi2p.bat b/src/win/launchi2p.bat
index 46eb78b..8555578 100644
--- a/src/win/launchi2p.bat
+++ b/src/win/launchi2p.bat
@@ -1,6 +1,6 @@
 @echo on
 
-SET MYPATH=%~dp0
+SET "MYPATH=%~dp0"
 call "%MYPATH%common.bat"
 
 
diff --git a/src/win/test.bat b/src/win/test.bat
index 039e7f1..c8e9be4 100644
--- a/src/win/test.bat
+++ b/src/win/test.bat
@@ -1,5 +1,5 @@
 
-SET MYPATH=%~dp0
+SET "MYPATH=%~dp0"
 
 call "%MYPATH%common.bat"