diff --git a/BizHawk.Client.Common/Global.cs b/BizHawk.Client.Common/Global.cs
index edd287ef49..db1ccedf94 100644
--- a/BizHawk.Client.Common/Global.cs
+++ b/BizHawk.Client.Common/Global.cs
@@ -87,6 +87,8 @@ namespace BizHawk.Client.Common
 						return SystemInfo.Intellivision;
 					case "SG":
 						return SystemInfo.SG;
+                    case "GG":
+                        return SystemInfo.GG;
 					case "SMS":
 						if ((Emulator as SMS).IsGameGear)
 						{
diff --git a/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs b/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs
index ca8492c3e7..9b0aa4aedf 100644
--- a/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs
+++ b/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs
@@ -319,11 +319,13 @@ namespace BizHawk.Client.Common.MovieConversionExtensions
 			if (Global.Emulator is SMS && (Global.Emulator as SMS).IsSG1000)
 			{
 				movie.HeaderEntries.Add("IsSGMode", "1");
-			}
+                movie.SystemID = "SG";
+            }
 
 			if (Global.Emulator is SMS && (Global.Emulator as SMS).IsGameGear)
 			{
 				movie.HeaderEntries.Add("IsGGMode", "1");
+                movie.SystemID = "GG";
 			}
 
 			if (Global.Emulator is GPGX && (Global.Emulator as GPGX).IsMegaCD)