diff --git a/source/net/sourceforge/filebot/Settings.java b/source/net/sourceforge/filebot/Settings.java
index 61476def..e6f0b7d7 100644
--- a/source/net/sourceforge/filebot/Settings.java
+++ b/source/net/sourceforge/filebot/Settings.java
@@ -92,12 +92,9 @@ public final class Settings {
 		if (applicationDirPath != null && applicationDirPath.length() > 0) {
 			// use given path
 			applicationFolder = new File(applicationDirPath);
-		} else if (getApplicationDeployment() != null) {
+		} else {
 			// create folder in user home (can't use working directory for web start applications)
 			applicationFolder = new File(System.getProperty("user.home"), ".filebot");
-		} else {
-			// use working directory
-			applicationFolder = new File(System.getProperty("user.dir"));
 		}
 		
 		// create folder if necessary