diff --git a/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs b/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs
index 6f1ed73f4e..402b124853 100644
--- a/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs
+++ b/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs
@@ -269,7 +269,12 @@ namespace BizHawk.Client.EmuHawk
 					}
 
 					_rowCount = value;
-					_selectedItems.RemoveWhere(i => i.RowIndex >= _rowCount);
+
+					if (_selectedItems.Max(s => s.RowIndex) >= _rowCount)
+					{
+						_selectedItems.RemoveWhere(i => i.RowIndex >= _rowCount);
+					}
+
 					RecalculateScrollBars();
 				}