diff --git a/examples/Demo/Shared/Microsoft.FluentUI.AspNetCore.Components.xml b/examples/Demo/Shared/Microsoft.FluentUI.AspNetCore.Components.xml
index 028eca3ade..c353903fe4 100644
--- a/examples/Demo/Shared/Microsoft.FluentUI.AspNetCore.Components.xml
+++ b/examples/Demo/Shared/Microsoft.FluentUI.AspNetCore.Components.xml
@@ -3345,7 +3345,7 @@
         </member>
         <member name="P:Microsoft.FluentUI.AspNetCore.Components.DialogParameters.Visible">
             <summary>
-            Gets or sets if a dialog is visible or nt (Hidden)
+            Gets or sets if a dialog is visible or not (Hidden)
             </summary>
         </member>
         <member name="P:Microsoft.FluentUI.AspNetCore.Components.DialogParameters.PreventScroll">
@@ -3406,7 +3406,7 @@
             <summary>
             Gets or sets the height of the dialog. Must be a valid CSS height value like "600px" or "3em"
             Only used if Alignment is set to "HorizontalAlignment.Center"
-            </summary>  
+            </summary>
         </member>
         <member name="P:Microsoft.FluentUI.AspNetCore.Components.DialogParameters.DialogBodyStyle">
             <summary>
@@ -3440,7 +3440,7 @@
         </member>
         <member name="P:Microsoft.FluentUI.AspNetCore.Components.DialogParameters.ShowSecondaryAction">
             <summary>
-            Gets whether the secondary button is displayed or not. Depends on SecondaryAction having a value. 
+            Gets whether the secondary button is displayed or not. Depends on SecondaryAction having a value.
             </summary>
         </member>
         <member name="P:Microsoft.FluentUI.AspNetCore.Components.DialogParameters.OnDialogResult">
diff --git a/src/Core/Components/DataGrid/FluentDataGridRow.razor.cs b/src/Core/Components/DataGrid/FluentDataGridRow.razor.cs
index bfcd3de9e6..c17580ed54 100644
--- a/src/Core/Components/DataGrid/FluentDataGridRow.razor.cs
+++ b/src/Core/Components/DataGrid/FluentDataGridRow.razor.cs
@@ -137,8 +137,14 @@ internal async Task HandleOnRowKeyDownAsync(string rowId, KeyboardEventArgs e)
             return;
         }
 
-        var row = GetRow(rowId, r => r.RowType == DataGridRowType.Default);
-        if (row != null)
+        var row = GetRow(rowId);
+
+        if (row != null && Owner.Grid.OnRowClick.HasDelegate)
+        {
+            await Owner.Grid.OnRowClick.InvokeAsync(row);
+        }
+
+        if (row != null && row.RowType == DataGridRowType.Default)
         {
             foreach (var column in Owner.Grid._columns)
             {