diff --git a/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.Designer.cs b/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.Designer.cs
index 9c8aac3757..2248b4d4b4 100644
--- a/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.Designer.cs
@@ -2,7 +2,7 @@
 {
 	partial class MultiDiskBundler
 	{
-		/// <summary>
+		/// <summary>SystemLabel
 		/// Required designer variable.
 		/// </summary>
 		private System.ComponentModel.IContainer components = null;
@@ -148,9 +148,9 @@
             "ZXSpectrum",
             "AmstradCPC",
             "Game Gear"});
-            this.SystemDropDown.Location = new System.Drawing.Point(425, 75);
+            this.SystemDropDown.Location = new System.Drawing.Point(405, 75);
             this.SystemDropDown.Name = "SystemDropDown";
-            this.SystemDropDown.Size = new System.Drawing.Size(69, 21);
+            this.SystemDropDown.Size = new System.Drawing.Size(89, 21);
             this.SystemDropDown.TabIndex = 14;
             this.SystemDropDown.SelectedIndexChanged += new System.EventHandler(this.SystemDropDown_SelectedIndexChanged);
             // 
@@ -158,7 +158,7 @@
             // 
             this.SystemLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.SystemLabel.AutoSize = true;
-            this.SystemLabel.Location = new System.Drawing.Point(375, 78);
+            this.SystemLabel.Location = new System.Drawing.Point(355, 78);
             this.SystemLabel.Name = "SystemLabel";
             this.SystemLabel.Size = new System.Drawing.Size(44, 13);
             this.SystemLabel.TabIndex = 15;
diff --git a/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.cs b/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.cs
index 18f83328a7..842c5f709e 100644
--- a/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.cs
+++ b/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.cs
@@ -10,6 +10,7 @@ using System.Xml.Linq;
 using BizHawk.Emulation.Common;
 using BizHawk.Client.Common;
 using BizHawk.Common;
+using BizHawk.Emulation.Cores.Sega.MasterSystem;
 
 namespace BizHawk.Client.EmuHawk
 {
@@ -50,6 +51,10 @@ namespace BizHawk.Client.EmuHawk
 				{
 					SystemDropDown.SelectedItem = Emulator.SystemId;
 				}
+				else if (Emulator is SMS sms && sms.IsGameGear)
+				{
+					SystemDropDown.SelectedItem = "Game Gear";
+				}
 
 				FileSelectors.First().Path = MainForm.CurrentlyOpenRom;
 			}