diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index dc62be999b..222d900efd 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -2166,6 +2166,10 @@ namespace BizHawk.Client.EmuHawk
 			{
 				newp = 200;
 			}
+			else if (oldp < 300)
+			{
+				newp = 300;
+			}
 			else if (oldp < 400)
 			{
 				newp = 400;
@@ -2178,10 +2182,14 @@ namespace BizHawk.Client.EmuHawk
 			{
 				newp = 1600;
 			}
-			else
+			else if (oldp < 3200)
 			{
 				newp = 3200;
 			}
+			else
+			{
+				newp = 6400;
+			}
 
 			SetSpeedPercent(newp);
 		}
@@ -2197,7 +2205,11 @@ namespace BizHawk.Client.EmuHawk
 			var oldp = Global.Config.SpeedPercent;
 			int newp;
 
-			if (oldp > 1600)
+			if (oldp > 3200)
+			{
+				newp = 3200;
+			}
+			else if (oldp > 1600)
 			{
 				newp = 1600;
 			}
@@ -2209,6 +2221,10 @@ namespace BizHawk.Client.EmuHawk
 			{
 				newp = 400;
 			}
+			else if (oldp > 300)
+			{
+				newp = 300;
+			}
 			else if (oldp > 200)
 			{
 				newp = 200;