diff --git a/Elwig/Helpers/ControlUtils.cs b/Elwig/Helpers/ControlUtils.cs index fcc014b..de449c4 100644 --- a/Elwig/Helpers/ControlUtils.cs +++ b/Elwig/Helpers/ControlUtils.cs @@ -183,10 +183,10 @@ namespace Elwig.Helpers { } else { input.SelectedItem = GetItemFromSource(input.ItemsSource, (int)hash); } - if (input is ListBox lb) { - lb.ScrollIntoView(lb.SelectedItem); - } else if (input is DataGrid dg) { - dg.ScrollIntoView(dg.SelectedItem); + if (input is ListBox lb && lb.SelectedItem is object lbItem) { + lb.ScrollIntoView(lbItem); + } else if (input is DataGrid dg && dg.SelectedItem is object dgItem) { + dg.ScrollIntoView(dgItem); } }