diff --git a/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs b/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs
index 3b9f07bf2a..180f2af9bd 100644
--- a/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs
+++ b/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs
@@ -1327,6 +1327,15 @@ namespace BizHawk.Client.EmuHawk
 			ColumnRightClick?.Invoke(this, new ColumnClickEventArgs(column));
 		}
 
+		// This allows arrow keys to be detected by KeyDown.
+		protected override void OnPreviewKeyDown(PreviewKeyDownEventArgs e)
+		{
+			if (e.KeyCode == Keys.Left || e.KeyCode == Keys.Right || e.KeyCode == Keys.Up || e.KeyCode == Keys.Down)
+			{
+				e.IsInputKey = true;
+			}
+		}
+
 		protected override void OnKeyDown(KeyEventArgs e)
 		{
 			if (!SuspendHotkeys)
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
index 255147d997..bcc8705a32 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
@@ -1264,7 +1264,6 @@
 			this.TasView.MouseEnter += new System.EventHandler(this.TasView_MouseEnter);
 			this.TasView.MouseMove += new System.Windows.Forms.MouseEventHandler(this.TasView_MouseMove);
 			this.TasView.MouseUp += new System.Windows.Forms.MouseEventHandler(this.TasView_MouseUp);
-			this.TasView.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.TasView_PreviewKeyDown);
 			// 
 			// TasStatusStrip
 			// 
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
index 9716f22b35..8b3a5797ae 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
@@ -1504,17 +1504,6 @@ namespace BizHawk.Client.EmuHawk
 			RefreshDialog();
 		}
 
-		/// <summary>
-		/// This allows arrow keys to be detected by KeyDown.
-		/// </summary>
-		private void TasView_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
-		{
-			if (e.KeyCode == Keys.Left || e.KeyCode == Keys.Right || e.KeyCode == Keys.Up || e.KeyCode == Keys.Down)
-			{
-				e.IsInputKey = true;
-			}
-		}
-
 		#endregion
 	}
 }