diff --git a/src/BizHawk.Client.Common/movie/bk2/Bk2MnemonicLookup.cs b/src/BizHawk.Client.Common/movie/bk2/Bk2MnemonicLookup.cs
index 61a4921aa0..7f391f6298 100644
--- a/src/BizHawk.Client.Common/movie/bk2/Bk2MnemonicLookup.cs
+++ b/src/BizHawk.Client.Common/movie/bk2/Bk2MnemonicLookup.cs
@@ -624,6 +624,8 @@ namespace BizHawk.Client.Common
 				["Right Stick, Pinky"] = 'p',
 				["Analog"] = 'M',
 				["Offscreen Shot"] = 'o',
+				["Open Tray"] = 'o',
+				["Close Tray"] = 'c',
 			},
 		};
 
@@ -643,7 +645,8 @@ namespace BizHawk.Client.Common
 			["LStick Y"] = "lsY",
 			["RStick X"] = "rsX",
 			["RStick Y"] = "rsY",
-			["Disc Select"] = "Disc"
+			["Disc Select"] = "Disc",
+			["Disk Index"] = "Disk",
 		};
 
 		private static readonly Dictionary<string, Dictionary<string, string>> AxisSystemOverrides = new Dictionary<string, Dictionary<string, string>>
diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index a4fa5fb03c..6d964fe4f1 100644
--- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -377,11 +377,12 @@ namespace BizHawk.Client.EmuHawk
 					c.Name == "Power"
 					|| c.Name == "Reset"
 					|| c.Name == "Light Sensor"
-					|| c.Name == "Open"
-					|| c.Name == "Close"
 					|| c.Name == "Disc Select"
+					|| c.Name == "Disk Index"
 					|| c.Name.StartsWith("Tilt")
 					|| c.Name.StartsWith("Key ")
+					|| c.Name.StartsWith("Open")
+					|| c.Name.StartsWith("Close")
 					|| c.Name.EndsWith("Tape")
 					|| c.Name.EndsWith("Disk")
 					|| c.Name.EndsWith("Block")