diff --git a/PKHeX.Core/Game/GameUtil.cs b/PKHeX.Core/Game/GameUtil.cs
index bcd3b8c48..cf2410a22 100644
--- a/PKHeX.Core/Game/GameUtil.cs
+++ b/PKHeX.Core/Game/GameUtil.cs
@@ -210,9 +210,9 @@ public static class GameUtil
         SM     => version is SN or MN,
         USUM   => version is US or UM,
         Gen7   => version is SN or MN or US or UM or SM or USUM,
-        
+
         GG     => version is GP or GE,
-        Gen7b  => version is GP or GE or GO,
+        Gen7b  => version is GP or GE or GO or GG,
 
         SWSH   => version is SW or SH,
         BDSP   => version is BD or SP,
diff --git a/PKHeX.Core/PKM/Util/EntityContext.cs b/PKHeX.Core/PKM/Util/EntityContext.cs
index b2f1555bf..c8ca557ff 100644
--- a/PKHeX.Core/PKM/Util/EntityContext.cs
+++ b/PKHeX.Core/PKM/Util/EntityContext.cs
@@ -131,7 +131,7 @@ public static class EntityContextExtensions
     /// </summary>
     public static EntityContext GetContext(this GameVersion version) => version switch
     {
-        GameVersion.GP or GameVersion.GE or GameVersion.GO => Gen7b,
+        GameVersion.GP or GameVersion.GE or GameVersion.GO or GameVersion.GG or GameVersion.Gen7b => Gen7b,
         GameVersion.PLA => Gen8a,
         GameVersion.BD or GameVersion.SP => Gen8b,
         _ => (EntityContext)version.GetGeneration(),