diff --git a/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs b/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs
index 0a85ed865e..82972a4d98 100644
--- a/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs
+++ b/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs
@@ -245,9 +245,9 @@ namespace BizHawk.Client.EmuHawk
 			{
 				if (_rowCount != value)
 				{
-					RecalculateScrollBars();
 					_rowCount = value;
 					_selectedItems.RemoveWhere(i => i.RowIndex >= _rowCount);
+					RecalculateScrollBars();
 				}
 
 				// Similarly to ListView in virtual mode, we want to always refresh