diff --git a/src/main/java/org/jointheleague/ir/ExportPanel.java b/src/main/java/org/jointheleague/ir/ExportPanel.java
index ff7b19c..76518ef 100644
--- a/src/main/java/org/jointheleague/ir/ExportPanel.java
+++ b/src/main/java/org/jointheleague/ir/ExportPanel.java
@@ -43,6 +43,9 @@ public ExportPanel(JDialog container, String fileName, DetectionList db, CSVHand
 		String fileWithoutExt = fileName.substring(0, fileName.indexOf('.'));
 
 		this.saveDir = new File(Cache.get("SaveDirectory"));
+		if(!this.saveDir.exists()) {
+			this.saveDir = new File(System.getProperty("user.dir"));
+		}
 		this.fileName = fileWithoutExt + ".csv";
 
 		JPanel directoryPanel = new JPanel();