diff --git a/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs b/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs
index 854a9697ad..e596621cfc 100644
--- a/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs
+++ b/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs
@@ -43,6 +43,8 @@ namespace BizHawk.Client.EmuHawk
 		public bool denoteStatesWithBGColor { get; set; }
 		public bool denoteMarkersWithIcons { get; set; }
 		public bool denoteMarkersWithBGColor { get; set; }
+		public bool allowRightClickSelecton { get; set; }
+		public bool letKeysModifySelection { get; set; }
 
 		private IntPtr RotatedFont;
 		private readonly Font NormalFont;
@@ -1133,6 +1135,18 @@ namespace BizHawk.Client.EmuHawk
 			}
 
 			base.OnMouseDown(e);
+
+			if (allowRightClickSelecton && e.Button == MouseButtons.Right)
+			{
+				if (!IsHoveringOnColumnCell)
+				{
+					_currentX = e.X;
+					_currentY = e.Y;
+					Cell newCell = CalculatePointedCell(_currentX.Value, _currentY.Value);
+					CellChanged(newCell);
+					SelectCell(CurrentCell);
+				}
+			}
 		}
 
 		protected override void OnMouseUp(MouseEventArgs e)
@@ -1281,6 +1295,58 @@ namespace BizHawk.Client.EmuHawk
 				LastVisibleRow = RowCount;
 				Refresh();
 			}
+			else if (e.Control && !e.Shift && !e.Alt && e.KeyCode == Keys.Up) // Ctrl + Up
+			{
+				if (SelectedRows.Any() && letKeysModifySelection)
+				{
+					foreach (var row in SelectedRows.ToList())
+					{
+						SelectRow(row - 1, true);
+						SelectRow(row, false);
+					}
+				}
+			}
+			else if (e.Control && !e.Shift && !e.Alt && e.KeyCode == Keys.Down) // Ctrl + Down
+			{
+				if (SelectedRows.Any() && letKeysModifySelection)
+				{
+					foreach (var row in SelectedRows.Reverse().ToList())
+					{
+						SelectRow(row + 1, true);
+						SelectRow(row, false);
+					}
+				}
+			}
+			else if (!e.Control && e.Shift && !e.Alt && e.KeyCode == Keys.Up) // Shift + Up
+			{
+				if (SelectedRows.Any() && letKeysModifySelection)
+				{
+					SelectRow(SelectedRows.First() - 1, true);
+				}
+			}
+			else if (!e.Control && e.Shift && !e.Alt && e.KeyCode == Keys.Down) // Shift + Down
+			{
+				if (SelectedRows.Any() && letKeysModifySelection)
+				{
+					SelectRow(SelectedRows.Last() + 1, true);
+				}
+			}
+			else if (!e.Control && !e.Shift && !e.Alt && e.KeyCode == Keys.Up) // Up
+			{
+				if (FirstVisibleRow > 0)
+				{
+					FirstVisibleRow--;
+					Refresh();
+				}
+			}
+			else if (!e.Control && !e.Shift && !e.Alt && e.KeyCode == Keys.Down) // Down
+			{
+				if (FirstVisibleRow < RowCount - 1)
+				{
+					FirstVisibleRow++;
+					Refresh();
+				}
+			}
 
 			base.OnKeyDown(e);
 		}
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.Designer.cs
index 12ffa1d6bc..9ae6f53334 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.Designer.cs
@@ -226,6 +226,7 @@
 			this.BranchView.denoteMarkersWithIcons = false;
 			this.BranchView.denoteStatesWithBGColor = false;
 			this.BranchView.denoteStatesWithIcons = false;
+			this.BranchView.allowRightClickSelecton = true;
 			this.BranchView.FullRowSelect = true;
 			this.BranchView.HideWasLagFrames = false;
 			this.BranchView.HorizontalOrientation = false;
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
index 667ca02210..f4f8193ec2 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
@@ -326,6 +326,9 @@ namespace BizHawk.Client.EmuHawk
 			LoadBranchButton.Enabled =
 			EditBranchTextButton.Enabled =
 				SelectedBranch != null;
+
+			BranchesContextMenu.Close();
+
 			if (e.Button == MouseButtons.Left)
 			{
 				if (BranchView.CurrentCell != null && BranchView.CurrentCell.IsDataCell
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs
index e8f408bd41..7c7d2e3e03 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs
@@ -185,6 +185,7 @@
 			// 
 			this.MarkerView.AllowColumnReorder = false;
 			this.MarkerView.AllowColumnResize = false;
+			this.MarkerView.allowRightClickSelecton = true;
 			this.MarkerView.AlwaysScroll = false;
 			this.MarkerView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
@@ -210,6 +211,7 @@
 			this.MarkerView.TabIndex = 5;
 			this.MarkerView.TabStop = false;
 			this.MarkerView.SelectedIndexChanged += new System.EventHandler(this.MarkerView_SelectedIndexChanged);
+			this.MarkerView.MouseClick += new System.Windows.Forms.MouseEventHandler(this.MarkerView_MouseClick);
 			this.MarkerView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.MarkerView_MouseDoubleClick);
 			// 
 			// MarkerControl
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs
index cfe97bbfba..500ee69340 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs
@@ -277,5 +277,10 @@ namespace BizHawk.Client.EmuHawk
 			}
 			return -1;
 		}
+
+		private void MarkerView_MouseClick(object sender, MouseEventArgs e)
+		{
+			MarkerContextMenu.Close();
+		}
 	}
 }
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
index 3f5bad9155..53c434725a 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
@@ -1125,6 +1125,8 @@ namespace BizHawk.Client.EmuHawk
 			this.TasView.denoteMarkersWithIcons = false;
 			this.TasView.denoteStatesWithBGColor = false;
 			this.TasView.denoteStatesWithIcons = false;
+			this.TasView.allowRightClickSelecton = false;
+			this.TasView.letKeysModifySelection = true;
 			this.TasView.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
 			this.TasView.FullRowSelect = true;
 			this.TasView.HideWasLagFrames = false;
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
index 1a983c21cd..b15ad1a9d0 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
@@ -855,22 +855,10 @@ namespace BizHawk.Client.EmuHawk
 			{
 				GoToPreviousMarker();
 			}
-			else if (e.Control && !e.Shift && !e.Alt && e.KeyCode == Keys.Right) // Ctrl + Left
+			else if (e.Control && !e.Shift && !e.Alt && e.KeyCode == Keys.Right) // Ctrl + Right
 			{
 				GoToNextMarker();
 			}
-			else if (e.Control && !e.Shift && !e.Alt && e.KeyCode == Keys.Up) // Ctrl + Up
-			{
-				GoToPreviousFrame();
-			}
-			else if (e.Control && !e.Shift && !e.Alt && e.KeyCode == Keys.Down) // Ctrl + Down
-			{
-				GoToNextFrame();
-			}
-			else if (e.Control && !e.Alt && e.Shift && e.KeyCode == Keys.R) // Ctrl + Shift + R
-			{
-				TasView.HorizontalOrientation ^= true;
-			}
 
 			// SuuperW: Float Editing
 			if (_floatEditRow != -1)