diff --git a/src/tools/trackeditor/gui/EditorFrame.java b/src/tools/trackeditor/gui/EditorFrame.java
index bb7bb1750..90cd64de1 100644
--- a/src/tools/trackeditor/gui/EditorFrame.java
+++ b/src/tools/trackeditor/gui/EditorFrame.java
@@ -3063,8 +3063,10 @@ public class EditorFrame extends JFrame
 		fc.setApproveButtonMnemonic(0);
 		fc.setDialogTitle("Import track from Xml");
 		fc.setVisible(true);
-		fc.setCurrentDirectory(new File(System.getProperty("user.dir") + "/tracks"));
-		//fc.setCurrentDirectory(new File("/usr/share/games/torcs/tracks"));
+		String trackDir = preferences.get(SD_DATA_DIRECTORY, null);
+		if (trackDir == null)
+			trackDir = System.getProperty("user.dir");
+		fc.setCurrentDirectory(new File(trackDir + "/tracks"));
 		CustomFileFilter filter = new CustomFileFilter();
 		
 		filter.addValid(".xml");
diff --git a/src/tools/trackeditor/utils/Properties.java b/src/tools/trackeditor/utils/Properties.java
index 36fd3a289..3e0b31c33 100644
--- a/src/tools/trackeditor/utils/Properties.java
+++ b/src/tools/trackeditor/utils/Properties.java
@@ -34,7 +34,7 @@ public  class Properties
 	private static Properties	instance				= new Properties();
 	private Vector<ActionListener>	propertiesListeners	= new Vector<ActionListener>();
 	public final String			title					= "sd2-trackeditor";
-	public final String			version					= "1.4.55";
+	public final String			version					= "1.4.56";
 	private String				path;
 
 	private double				imageScale				= 1;