diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs
index aacd30162a..0fef608c16 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs
@@ -17,20 +17,24 @@ namespace BizHawk.Client.EmuHawk
 			{
 				if (ss.UseSixButton)
 				{
-					yield return new VirtualPad(ThreeButtonController(1));
+					yield return new VirtualPad(SixButtonController(1));
+				}
+				else
+				{
+					yield return new VirtualPad(ThreeButtonController(2));
 				}
 			}
 			else if (ss.ControlType == GPGX.ControlType.Normal)
 			{
 				if (ss.UseSixButton)
 				{
-					yield return new VirtualPad(ThreeButtonController(1));
-					yield return new VirtualPad(ThreeButtonController(2));
+					yield return new VirtualPad(SixButtonController(1));
+					yield return new VirtualPad(SixButtonController(2));
 				}
 				else
 				{
-					yield return new VirtualPad(SixButtonController(1));
-					yield return new VirtualPad(SixButtonController(2));
+					yield return new VirtualPad(ThreeButtonController(1));
+					yield return new VirtualPad(ThreeButtonController(2));
 				}
 			}
 			else