diff --git a/BizHawk.MultiClient/config/ControllerConfig.Designer.cs b/BizHawk.MultiClient/config/ControllerConfig.Designer.cs
index efefef0831..42dd224196 100644
--- a/BizHawk.MultiClient/config/ControllerConfig.Designer.cs
+++ b/BizHawk.MultiClient/config/ControllerConfig.Designer.cs
@@ -274,8 +274,8 @@
 			this.PlatformTabControl.Controls.Add(this.tabPagePCE);
 			this.PlatformTabControl.Controls.Add(this.tabPageAtari2600);
 			this.PlatformTabControl.Controls.Add(this.tabPageC64);
-			this.PlatformTabControl.Controls.Add(this.tabPageTI83);
 			this.PlatformTabControl.Controls.Add(this.tabPageColeco);
+			this.PlatformTabControl.Controls.Add(this.tabPageTI83);
 			this.PlatformTabControl.Location = new System.Drawing.Point(12, 21);
 			this.PlatformTabControl.Name = "PlatformTabControl";
 			this.PlatformTabControl.SelectedIndex = 0;
diff --git a/BizHawk.MultiClient/config/ControllerConfig.cs b/BizHawk.MultiClient/config/ControllerConfig.cs
index 077571bdae..1bc984016f 100644
--- a/BizHawk.MultiClient/config/ControllerConfig.cs
+++ b/BizHawk.MultiClient/config/ControllerConfig.cs
@@ -121,12 +121,59 @@ namespace BizHawk.MultiClient
 
 			SetAutoTab(true);
 
+
+			SetTabByPlatform();
+
 			if (!Global.MainForm.INTERIM)
 			{
 				PlatformTabControl.Controls.Remove(tabPageC64);
 			}
 		}
 
+		private void SetTabByPlatform()
+		{
+			switch (Global.Emulator.SystemId)
+			{
+				case "NES":
+				case "FDS":
+					PlatformTabControl.SelectTab(tabPageNES);
+					break;
+				case "SNES":
+				case "SGB": //TODO: I think it never reports this, so this line could/should be removed
+					PlatformTabControl.SelectTab(tabPageSNES);
+					break;
+				case "GB":
+				case "GBC":
+					PlatformTabControl.SelectTab(tabPageGameboy);
+					break;
+				case "GEN":
+					PlatformTabControl.SelectTab(tabPageGenesis);
+					break;
+				case "SMS":
+				case "GG":
+				case "SG":
+					PlatformTabControl.SelectTab(tabPageSMS);
+					break;
+				case "PCE":
+				case "SGX":
+				case "PCECD":
+					PlatformTabControl.SelectTab(tabPagePCE);
+					break;
+				case "A26":
+					PlatformTabControl.SelectTab(tabPageAtari2600);
+					break;
+				case "C64":
+					PlatformTabControl.SelectTab(tabPageC64);
+					break;
+				case "Coleco":
+					PlatformTabControl.SelectTab(tabPageColeco);
+					break;
+				case "TI83":
+					PlatformTabControl.SelectTab(tabPageTI83);
+					break;
+			}
+		}
+
 		protected override void OnShown(EventArgs e)
 		{
 			//Input.Instance.EnableIgnoreModifiers = true;
diff --git a/BizHawk.MultiClient/config/PathConfig.cs b/BizHawk.MultiClient/config/PathConfig.cs
index 83e180b6d5..f038321c8c 100644
--- a/BizHawk.MultiClient/config/PathConfig.cs
+++ b/BizHawk.MultiClient/config/PathConfig.cs
@@ -162,7 +162,7 @@ namespace BizHawk.MultiClient
 			AVIBox.Text = Global.Config.AVIPath;
 			LogBox.Text = Global.Config.LogPath;
 
-
+			SetTabByPlatform();
 
 			if (!Global.MainForm.INTERIM)
 			{
@@ -170,66 +170,62 @@ namespace BizHawk.MultiClient
 				tabControl1.Controls.Remove(tabPageC64);
 				tabControl1.Controls.Remove(tabPageGBA);
 			}
-			else
-			{
-				switch (Global.Game.System)
-				{
-					case "NES":
-						tabControl1.SelectTab(tabPageNES);
-						break;
-					case "SNES":
-					case "SGB":
-						tabControl1.SelectTab(tabPageSNES);
-						break;
-					case "SMS":
-						tabControl1.SelectTab(tabPageSMS);
-						break;
-					case "SG":
-						tabControl1.SelectTab(tabPageSG1000);
-						break;
-					case "GG":
-						tabControl1.SelectTab(tabPageGGear);
-						break;
-					case "GEN":
-						tabControl1.SelectTab(tabPageGenesis);
-						break;
-					case "PCE":
-					case "PCECD":
-					case "SGX":
-						tabControl1.SelectTab(tabPagePCE);
-						break;
-					case "GB":
-					case "GBC":
-						tabControl1.SelectTab(tabPageGameboy);
-						break;
-					case "TI83":
-						tabControl1.SelectTab(tabPageTI83);
-						break;
-					case "A26":
-						tabControl1.SelectTab(tabPageAtari2600);
-						break;
-					case "INTV":
-						tabControl1.SelectTab(tabPageIntellivision);
-						break;
-					case "C64":
-						tabControl1.SelectTab(tabPageC64);
-						break;
-					case "Coleco":
-						tabControl1.SelectTab(tabPageColeco);
-						break;
-					case "GBA":
-						tabControl1.SelectTab(tabPageGBA);
-						break;
-					case "NULL":
-						tabControl1.SelectTab(tabPageTools);
-						break;
-				}
-			}
+		}
 
-			int x = 0;
-			x++;
-			int y = x;
-			y++;
+		private void SetTabByPlatform()
+		{
+			switch (Global.Game.System)
+			{
+				case "NES":
+					tabControl1.SelectTab(tabPageNES);
+					break;
+				case "SNES":
+				case "SGB":
+					tabControl1.SelectTab(tabPageSNES);
+					break;
+				case "SMS":
+					tabControl1.SelectTab(tabPageSMS);
+					break;
+				case "SG":
+					tabControl1.SelectTab(tabPageSG1000);
+					break;
+				case "GG":
+					tabControl1.SelectTab(tabPageGGear);
+					break;
+				case "GEN":
+					tabControl1.SelectTab(tabPageGenesis);
+					break;
+				case "PCE":
+				case "PCECD":
+				case "SGX":
+					tabControl1.SelectTab(tabPagePCE);
+					break;
+				case "GB":
+				case "GBC":
+					tabControl1.SelectTab(tabPageGameboy);
+					break;
+				case "TI83":
+					tabControl1.SelectTab(tabPageTI83);
+					break;
+				case "A26":
+					tabControl1.SelectTab(tabPageAtari2600);
+					break;
+				case "INTV":
+					tabControl1.SelectTab(tabPageIntellivision);
+					break;
+				case "C64":
+					tabControl1.SelectTab(tabPageC64);
+					break;
+				case "Coleco":
+					tabControl1.SelectTab(tabPageColeco);
+					break;
+				case "GBA":
+					tabControl1.SelectTab(tabPageGBA);
+					break;
+				case "NULL":
+					tabControl1.SelectTab(tabPageTools);
+					break;
+			}
 		}
 
 		private void SaveSettings()