diff --git a/OpenRA.Editor/Form1.cs b/OpenRA.Editor/Form1.cs
index 8f9c7e17df..319cf725e7 100644
--- a/OpenRA.Editor/Form1.cs
+++ b/OpenRA.Editor/Form1.cs
@@ -34,7 +34,6 @@ namespace OpenRA.Editor
 
 			var manifest = new Manifest(new[] { currentMod });
 			Game.modData = new ModData( manifest );
-			FileSystem.LoadFromManifest( manifest );
 
 			Rules.LoadRules(manifest, new Map());
 
@@ -61,7 +60,6 @@ namespace OpenRA.Editor
 
 			var manifest = new Manifest(new[] { currentMod });
 			Game.modData = new ModData( manifest );
-			FileSystem.LoadFromManifest( manifest );
 
 			// load the map
 			var map = new Map(new Folder(mapname));
@@ -87,7 +85,6 @@ namespace OpenRA.Editor
 
 			var manifest = new Manifest(new[] { currentMod });
 			Game.modData = new ModData( manifest );
-			FileSystem.LoadFromManifest( manifest );
 
 			PrepareMapResources(manifest, map);
 
diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs
index 30d002f7cd..537fc9b95c 100644
--- a/OpenRA.Game/Game.cs
+++ b/OpenRA.Game/Game.cs
@@ -70,7 +70,6 @@ namespace OpenRA
 			Timer.Time("manifest: {0}");
 			modData = new ModData( manifest );
 			SheetBuilder.Initialize();
-			FileSystem.LoadFromManifest( manifest );
 			Timer.Time("load assemblies, packages: {0}");
 			ChromeProvider.Initialize(manifest.Chrome);
 			packageChangePending = false;
@@ -451,9 +450,6 @@ namespace OpenRA
 			LobbyInfo.GlobalSettings.Mods = Settings.InitialMods;
 			var manifest = new Manifest(LobbyInfo.GlobalSettings.Mods);
 			modData = new ModData( manifest );
-
-			// Load the default mod to access required files
-			FileSystem.LoadFromManifest( manifest );
 						
 			Renderer.SheetSize = Settings.SheetSize;
 
@@ -537,7 +533,6 @@ namespace OpenRA
 			AppDomain.CurrentDomain.AssemblyResolve += FileSystem.ResolveAssembly;
 			var manifest = new Manifest(mods);
 			modData = new ModData( manifest );
-			FileSystem.LoadFromManifest( manifest );
 
 			Rules.LoadRules(manifest, new Map());
 		}
diff --git a/OpenRA.Game/ModData.cs b/OpenRA.Game/ModData.cs
index 91e621163f..42570b13a9 100755
--- a/OpenRA.Game/ModData.cs
+++ b/OpenRA.Game/ModData.cs
@@ -15,6 +15,7 @@ namespace OpenRA
 		{
 			Manifest = manifest;
 			ObjectCreator = new ObjectCreator( manifest );
+			FileSystem.LoadFromManifest( manifest );
 		}
 	}
 }