diff --git a/Engine/Source/Programs/UnrealBuildTool/System/ProjectFileGenerator.cs b/Engine/Source/Programs/UnrealBuildTool/System/ProjectFileGenerator.cs
index f7e467f..4776c38 100644
--- a/Engine/Source/Programs/UnrealBuildTool/System/ProjectFileGenerator.cs
+++ b/Engine/Source/Programs/UnrealBuildTool/System/ProjectFileGenerator.cs
@@ -1607,6 +1607,7 @@ namespace UnrealBuildTool
                {
                    string ProjectFileNameBase = null;
                    string BaseFolder = null;
+                    string ProjectFileName = null;

                    string PossibleProgramTargetName = Utils.GetFilenameWithoutAnyExtensions( CurModuleFile );

@@ -1615,13 +1616,15 @@ namespace UnrealBuildTool
                    {
                        ProjectFileNameBase = PossibleProgramTargetName;
                        BaseFolder = Path.GetDirectoryName( CurModuleFile );
-                   }
-                   else if( IsEngineModule )
+                        ProjectFileName = Utils.MakePathRelativeTo(Path.Combine(IntermediateProjectFilesPath, ProjectFileNameBase + ProjectFileExtension), MasterProjectRelativePath);
+                    }
+                    else if( IsEngineModule )
                    {
                        ProjectFileNameBase = EngineProjectFileNameBase;
                        BaseFolder = EngineRelativePath;
-                   }
-                   else
+                        ProjectFileName = Utils.MakePathRelativeTo(Path.Combine(IntermediateProjectFilesPath, ProjectFileNameBase + ProjectFileExtension), MasterProjectRelativePath);
+                    }
+                    else
                    {
                        // Figure out which game project this target belongs to
                        UProjectInfo ProjectInfo = FindGameContainingFile(AllGames, CurModuleFile);
@@ -1631,10 +1634,11 @@ namespace UnrealBuildTool
                        }
                        BaseFolder = ProjectInfo.Folder;
                        ProjectFileNameBase = ProjectInfo.GameName;
-                   }
+                        // Use games folder as base
+                        ProjectFileName = Path.Combine(BaseFolder, "Intermediate", "ProjectFiles", ProjectFileNameBase + ProjectFileExtension);
+                    }

-                   // Setup a project file entry for this module's project.  Remember, some projects may host multiple modules!
-                   string ProjectFileName = Utils.MakePathRelativeTo( Path.Combine( IntermediateProjectFilesPath, ProjectFileNameBase + ProjectFileExtension ), MasterProjectRelativePath );
+                    // Setup a project file entry for this module's project.  Remember, some projects may host multiple modules!
                    bool bProjectAlreadyExisted;
                    var ProjectFile = FindOrAddProject( ProjectFileName, IncludeInGeneratedProjects:true, bAlreadyExisted:out bProjectAlreadyExisted );

@@ -1792,7 +1796,19 @@ namespace UnrealBuildTool
                        ProjectFilePath = Utils.MakePathRelativeTo(ProjectFilePath, MasterProjectRelativePath);

                        bool bProjectAlreadyExisted;
-                       var ProjectFile = FindOrAddProject(ProjectFilePath, IncludeInGeneratedProjects: true, bAlreadyExisted: out bProjectAlreadyExisted);
+                        ProjectFile ProjectFile = null;
+
+                        // Is it engine target or game target?
+                        if (IsEngineTarget)
+                        {
+                            ProjectFile = FindOrAddProject(ProjectFilePath, IncludeInGeneratedProjects: true, bAlreadyExisted: out bProjectAlreadyExisted);
+                        }
+                        else
+                        {
+                            ProjectFilePath = Path.Combine(GameFolder, "Intermediate", "ProjectFiles", ProjectFileNameBase + ProjectFileExtension);
+                            ProjectFile = FindOrAddProject(ProjectFilePath, IncludeInGeneratedProjects: true, bAlreadyExisted: out bProjectAlreadyExisted);
+                            bGeneratingGameProjectFiles = true;
+                        }
                        ProjectFile.IsForeignProject = bGeneratingGameProjectFiles && UnrealBuildTool.HasUProjectFile() && Utils.IsFileUnderDirectory(TargetFilePath, UnrealBuildTool.GetUProjectPath());
                        ProjectFile.IsGeneratedProject = true;
                        ProjectFile.IsStubProject = false;