diff --git a/src/BizHawk.Client.Common/cheats/GameSharkDecoder.cs b/src/BizHawk.Client.Common/cheats/GameSharkDecoder.cs
index f19728cf41..e46fd76592 100644
--- a/src/BizHawk.Client.Common/cheats/GameSharkDecoder.cs
+++ b/src/BizHawk.Client.Common/cheats/GameSharkDecoder.cs
@@ -17,7 +17,7 @@ namespace BizHawk.Client.Common.cheats
 		{
 			return _systemId switch
 			{
-				"GB" => GameBoy(code),
+				"GB" or "SGB" => GameBoy(code), // FIXME: HLE SGB cores report a "SGB" ID, while LLE SNES cores report a "SNES" ID, is this intentional?
 				"GBA" => Gba(code),
 				"GEN" => Gen(code),
 				"N64" => N64(code),
@@ -55,7 +55,6 @@ namespace BizHawk.Client.Common.cheats
 			if (code.LastIndexOf("-") == 7 && code.IndexOf("-") == 3)
 			{
 				return GbGgGameGenieDecoder.Decode(code);
-					
 			}
 
 			// Game Shark codes
diff --git a/src/BizHawk.Client.EmuHawk/tools/GameShark.cs b/src/BizHawk.Client.EmuHawk/tools/GameShark.cs
index 45846c60ae..dbc3c33549 100644
--- a/src/BizHawk.Client.EmuHawk/tools/GameShark.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/GameShark.cs
@@ -14,7 +14,7 @@ namespace BizHawk.Client.EmuHawk
 {
 	[Tool(
 		released: true,
-		supportedSystems: new[] { "GB", "GBA", "GEN", "N64", "NES", "PSX", "SAT", "SMS", "SNES" },
+		supportedSystems: new[] { "GB", "GBA", "GEN", "N64", "NES", "PSX", "SAT", "SGB", "SMS", "SNES" },
 		unsupportedCores: new[] { CoreNames.Snes9X })]
 	public partial class GameShark : ToolFormBase, IToolFormAutoConfig
 	{