diff --git a/Radzen.Blazor/RadzenDropDownDataGrid.razor.cs b/Radzen.Blazor/RadzenDropDownDataGrid.razor.cs index f29765cef16..ac7a9c41555 100644 --- a/Radzen.Blazor/RadzenDropDownDataGrid.razor.cs +++ b/Radzen.Blazor/RadzenDropDownDataGrid.razor.cs @@ -362,11 +362,13 @@ protected override async Task OnAfterRenderAsync(bool firstRender) } StateHasChanged(); - } - if (!Multiple && grid != null) - { - await grid.SelectRow(SelectedItem, false); + if (!Multiple && grid != null && SelectedItem != null) + { + var items = (LoadData.HasDelegate ? Data != null ? Data : Enumerable.Empty() : (pagedData != null ? pagedData : Enumerable.Empty())).OfType().ToList(); + selectedIndex = items.IndexOf(SelectedItem); + await JSRuntime.InvokeAsync("Radzen.focusTableRow", grid.GridId(), "ArrowDown", selectedIndex - 1, null); + } } await base.OnAfterRenderAsync(firstRender);