diff --git a/installer/msi/FileBot.exe b/installer/msi/FileBot.exe
index ba424cae..8ffdf3ab 100644
Binary files a/installer/msi/FileBot.exe and b/installer/msi/FileBot.exe differ
diff --git a/installer/msi/filebot-launch4j.xml b/installer/msi/filebot-launch4j.xml
index fc4c2698..41e11eac 100644
--- a/installer/msi/filebot-launch4j.xml
+++ b/installer/msi/filebot-launch4j.xml
@@ -19,5 +19,6 @@
     <maxVersion></maxVersion>
     <jdkPreference>preferJre</jdkPreference>
     <maxHeapSize>256</maxHeapSize>
+    <opt>-Dapplication.deployment=msi</opt>
   </jre>
 </launch4jConfig>
\ No newline at end of file
diff --git a/installer/webstart/filebot.jnlp b/installer/webstart/filebot.jnlp
index 1ddf2cac..240400bc 100644
--- a/installer/webstart/filebot.jnlp
+++ b/installer/webstart/filebot.jnlp
@@ -19,6 +19,7 @@
 	</security>
 
 	<resources>
+		<property name="application.deployment" value="webstart" />
 		<property name="jnlp.packEnabled" value="true" />
 
 		<java version="1.6+" max-heap-size="256m" />
diff --git a/installer/webstart/filebot.sfv.jnlp b/installer/webstart/filebot.sfv.jnlp
index 65de7ed8..74253440 100644
--- a/installer/webstart/filebot.sfv.jnlp
+++ b/installer/webstart/filebot.sfv.jnlp
@@ -31,6 +31,7 @@
 	</security>
 
 	<resources>
+		<property name="application.deployment" value="webstart" />
 		<property name="jnlp.packEnabled" value="true" />
 
 		<java version="1.6+" max-heap-size="256m" />
diff --git a/source/net/sourceforge/filebot/Settings.java b/source/net/sourceforge/filebot/Settings.java
index e716d2c1..cfc99530 100644
--- a/source/net/sourceforge/filebot/Settings.java
+++ b/source/net/sourceforge/filebot/Settings.java
@@ -34,7 +34,7 @@ public final class Settings {
 
 	public static File getApplicationFolder() {
 		// special handling for web start
-		if (System.getProperty("javawebstart.version") != null) {
+		if (System.getProperty("application.deployment") != null || System.getProperty("javawebstart.version") != null) {
 			// can't use working directory for web start applications
 			File folder = new File(System.getProperty("user.home"), "." + getApplicationName().toLowerCase());