diff --git a/src/nsis/i2pbrowser-installer.nsi b/src/nsis/i2pbrowser-installer.nsi
index b05d8d2..427d86a 100644
--- a/src/nsis/i2pbrowser-installer.nsi
+++ b/src/nsis/i2pbrowser-installer.nsi
@@ -416,11 +416,5 @@ SectionEnd
 
 Function LaunchLink
   #ExecShell "" "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk"
-  System::Call 'Kernel32::SetEnvironmentVariable(t, t)i ("ProgramFiles", "$PROGRAMFILES64").r0'
-  StrCmp $0 0 error
-    Exec "$INSTDIR\i2pbrowser.bat"
-    Goto done
-  error:
-    MessageBox MB_OK "Can't set environment variable"
-  done:
+  Exec "$INSTDIR\i2pbrowser.bat"
 FunctionEnd
diff --git a/src/win/i2pbrowser-private.bat b/src/win/i2pbrowser-private.bat
index 9998c62..8015087 100644
--- a/src/win/i2pbrowser-private.bat
+++ b/src/win/i2pbrowser-private.bat
@@ -1,4 +1,8 @@
-@echo off
+@echo on
+
+if not exist "%ProgramFiles%\I2P\" (
+  set ProgramFiles="C:\Program Files"
+)
 
 if exist "%ProgramFiles%\I2P\jpackaged" (
   start "i2p" /D "%LOCALAPPDATA%\I2P" "%ProgramFiles%\I2P\i2p.exe"
diff --git a/src/win/i2pbrowser.bat b/src/win/i2pbrowser.bat
index 6e94ecb..689cf94 100644
--- a/src/win/i2pbrowser.bat
+++ b/src/win/i2pbrowser.bat
@@ -1,4 +1,8 @@
-@echo off
+@echo on
+
+if not exist "%ProgramFiles%\I2P\" (
+  set ProgramFiles="C:\Program Files"
+)
 
 if exist "%ProgramFiles%\I2P\jpackaged" (
   start "i2p" /D "%LOCALAPPDATA%\I2P" "%ProgramFiles%\I2P\i2p.exe"