diff --git a/java/net/i2p/router/WinLauncher.java b/java/net/i2p/router/WinLauncher.java
index 8768699..3c42a04 100644
--- a/java/net/i2p/router/WinLauncher.java
+++ b/java/net/i2p/router/WinLauncher.java
@@ -86,7 +86,6 @@ public class WinLauncher {
         }
     }
 
-
     private static File selectHome() { //throws Exception {
         if (SystemVersion.isWindows()) {
             File home = new File(System.getProperty("user.home"));
diff --git a/src/nsis/i2pbrowser-installer.nsi b/src/nsis/i2pbrowser-installer.nsi
index 427d86a..b05d8d2 100644
--- a/src/nsis/i2pbrowser-installer.nsi
+++ b/src/nsis/i2pbrowser-installer.nsi
@@ -416,5 +416,11 @@ SectionEnd
 
 Function LaunchLink
   #ExecShell "" "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk"
-  Exec "$INSTDIR\i2pbrowser.bat"
+  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:
 FunctionEnd