diff --git a/BizHawk.Client.Common/config/Binding.cs b/BizHawk.Client.Common/config/Binding.cs
index a37d244a20..72aa9de3c7 100644
--- a/BizHawk.Client.Common/config/Binding.cs
+++ b/BizHawk.Client.Common/config/Binding.cs
@@ -229,10 +229,10 @@ namespace BizHawk.Client.Common
 						Bind("TAStudio", "Insert Frame", "Insert"),
 						Bind("TAStudio", "Delete Frames", "Ctrl+Delete"),
 						Bind("TAStudio", "Clone Frames", "Ctrl+Insert"),
-						Bind("TAStudio", "Analog Increment By One", "UpArrow"),
-						Bind("TAStudio", "Analog Decrement By One", "DownArrow"),
-						Bind("TAStudio", "Analog Increment By Ten", "Shift+UpArrow"),
-						Bind("TAStudio", "Analog Decrement By Ten", "Shift+DownArrow"),
+						Bind("TAStudio", "Analog Increment", "UpArrow"),
+						Bind("TAStudio", "Analog Decrement", "DownArrow"),
+						Bind("TAStudio", "Analog Incr. by 10", "Shift+UpArrow"),
+						Bind("TAStudio", "Analog Decr. by 10", "Shift+DownArrow"),
 						Bind("TAStudio", "Analog Maximum", "RightArrow"),
 						Bind("TAStudio", "Analog Minimum", "LeftArrow"),
 
diff --git a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
index 2c0a174eb2..1661709aa6 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
@@ -397,19 +397,19 @@ namespace BizHawk.Client.EmuHawk
 					if (GlobalWin.Tools.IsLoaded<TAStudio>())
 						GlobalWin.Tools.TAStudio.CloneFramesExternal();
 					break;
-				case "Analog Increment By One":
+				case "Analog Increment":
 					if (GlobalWin.Tools.IsLoaded<TAStudio>())
 						GlobalWin.Tools.TAStudio.AnalogIncrementByOne();
 					break;
-				case "Analog Decrement By One":
+				case "Analog Decrement":
 					if (GlobalWin.Tools.IsLoaded<TAStudio>())
 						GlobalWin.Tools.TAStudio.AnalogDecrementByOne();
 					break;
-				case "Analog Increment By Ten":
+				case "Analog Incr. by 10":
 					if (GlobalWin.Tools.IsLoaded<TAStudio>())
 						GlobalWin.Tools.TAStudio.AnalogIncrementByTen();
 					break;
-				case "Analog Decrement By Ten":
+				case "Analog Decr. by 10":
 					if (GlobalWin.Tools.IsLoaded<TAStudio>())
 						GlobalWin.Tools.TAStudio.AnalogDecrementByTen();
 					break;
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index 70f738a396..a315082fdb 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -695,7 +695,7 @@ namespace BizHawk.Client.EmuHawk
 			{
 				if(yield_alt) return false;
 				var ts = ActiveForm as TAStudio;
-				if(ts.IsInMenuLoop || ts.FloatEditingMode)
+				if(ts.IsInMenuLoop)
 					return false;
 			}