diff --git a/OpenRa.FileFormats/FileSystem.cs b/OpenRa.FileFormats/FileSystem.cs
index 648bdac9aa..673c3326fe 100644
--- a/OpenRa.FileFormats/FileSystem.cs
+++ b/OpenRa.FileFormats/FileSystem.cs
@@ -11,6 +11,7 @@ namespace OpenRa.FileFormats
 
 		public static void MountDefaultPackages()
 		{
+			FileSystem.Mount(new Folder("./"));
 			if( File.Exists( "main.mix" ) )
 				FileSystem.Mount( new Package( "main.mix" ) );
 			FileSystem.Mount( new Package( "redalert.mix" ) );
diff --git a/OpenRa.Game/MainWindow.cs b/OpenRa.Game/MainWindow.cs
index e35f87948f..750d964d71 100755
--- a/OpenRa.Game/MainWindow.cs
+++ b/OpenRa.Game/MainWindow.cs
@@ -35,7 +35,7 @@ namespace OpenRa.Game
 		
 		public MainWindow(Settings settings)
 		{
-			FileSystem.Mount(new Folder("./"));
+			
 			
 			FormBorderStyle = FormBorderStyle.None;
 			BackColor = Color.Black;
@@ -47,8 +47,10 @@ namespace OpenRa.Game
 			Game.Settings = new UserSettings();
 			try
 			{
+				FileSystem.MountTemporary(new Folder("./"));
 				IniFile SettingsRules = new IniFile(FileSystem.Open("settings.ini"));
 				FieldLoader.Load(Game.Settings, SettingsRules.GetSection("Settings"));
+				FileSystem.UnmountTemporaryPackages();
 			}
 			catch (FileNotFoundException) {}