diff --git a/OpenRA.Editor/Form1.cs b/OpenRA.Editor/Form1.cs
index 0d791a61e2..358528e17a 100755
--- a/OpenRA.Editor/Form1.cs
+++ b/OpenRA.Editor/Form1.cs
@@ -359,11 +359,10 @@ namespace OpenRA.Editor
 
 		void ImportLegacyMapClicked(object sender, EventArgs e)
 		{
-			var currentDirectory = Directory.GetCurrentDirectory();
-			using (var ofd = new OpenFileDialog { Filter = "Legacy maps (*.ini;*.mpr)|*.ini;*.mpr" })
+			using (var ofd = new OpenFileDialog { RestoreDirectory = true, 
+				Filter = "Legacy maps (*.ini;*.mpr)|*.ini;*.mpr" })
 				if (DialogResult.OK == ofd.ShowDialog())
 				{
-					Directory.SetCurrentDirectory(currentDirectory);
 					/* massive hack: we should be able to call NewMap() with the imported Map object,
 					 * but something's not right internally in it, unless loaded via the real maploader */