diff --git a/OpenRA.Mods.Common/Widgets/Logic/Editor/SaveMapLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Editor/SaveMapLogic.cs
index 77d8722688..c9435dcb1c 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/Editor/SaveMapLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Editor/SaveMapLogic.cs
@@ -112,7 +112,11 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 				}
 
 				if (map.Package != null)
+				{
 					selectedDirectory = writableDirectories.FirstOrDefault(k => k.Folder.Contains(map.Package.Name));
+					if (selectedDirectory == null)
+						selectedDirectory = writableDirectories.FirstOrDefault(k => Directory.GetDirectories(k.Folder.Name).Any(f => f.Contains(map.Package.Name)));
+				}
 
 				// Prioritize MapClassification.User directories over system directories
 				if (selectedDirectory == null)