diff --git a/BizHawk.Client.EmuHawk/CustomControls/InputRoll.Drawing.cs b/BizHawk.Client.EmuHawk/CustomControls/InputRoll.Drawing.cs
index 890b6a0d70..1efd3d202f 100644
--- a/BizHawk.Client.EmuHawk/CustomControls/InputRoll.Drawing.cs
+++ b/BizHawk.Client.EmuHawk/CustomControls/InputRoll.Drawing.cs
@@ -458,9 +458,10 @@ namespace BizHawk.Client.EmuHawk
 			int _lastVisibleRow = LastVisibleRow;
 			int lastRow = -1;
 			foreach (Cell cell in SelectedItems)
-			{
-				if (cell.RowIndex > _lastVisibleRow || cell.RowIndex < FirstVisibleRow)
-					continue;
+			{
+				if (cell.RowIndex > _lastVisibleRow || cell.RowIndex < FirstVisibleRow ||
+						!VisibleColumns.Contains(cell.Column))
+					continue;
 
 				Cell relativeCell = new Cell
 				{
@@ -540,7 +541,7 @@ namespace BizHawk.Client.EmuHawk
 			int range = Math.Min(LastVisibleRow, RowCount - 1) - startIndex + 1;
 			int lastVisible = LastVisibleColumnIndex;
 			int firstVisibleColumn = FirstVisibleColumn;
-            if (HorizontalOrientation)
+			if (HorizontalOrientation)
 			{
 				for (int i = 0, f = 0; f < range; i++, f++)
 				{