diff --git a/src/SuperBlazorComponents/Components/SuperDataGrid/SuperDataGrid.razor.Selection.cs b/src/SuperBlazorComponents/Components/SuperDataGrid/SuperDataGrid.razor.Selection.cs
index 7c42bd3..156a083 100644
--- a/src/SuperBlazorComponents/Components/SuperDataGrid/SuperDataGrid.razor.Selection.cs
+++ b/src/SuperBlazorComponents/Components/SuperDataGrid/SuperDataGrid.razor.Selection.cs
@@ -178,9 +178,9 @@ public async Task<bool> TrySelectFirstRow()
 			return false;
 		}
 
+		CurrentItem = firstItem;
 		_currentRowKey = TryGetItemKey(firstItem);
 		await InvokeAsync(StateHasChanged);
-		CurrentItem = firstItem;
 
 		return true;
 	}
diff --git a/src/SuperBlazorComponents/StartupExtensions.cs b/src/SuperBlazorComponents/StartupExtensions.cs
index fbd94a2..7c76959 100644
--- a/src/SuperBlazorComponents/StartupExtensions.cs
+++ b/src/SuperBlazorComponents/StartupExtensions.cs
@@ -1,4 +1,4 @@
-using SuperBlazorComponents.Components.Contextualization;
+using SuperBlazorComponents.Components.Contextualization;
 using SuperBlazorComponents.Components.SuperDataGrid;
 using SuperBlazorComponents.Components.SuperTabs;
 using SuperBlazorComponents.Localization;
diff --git a/src/SuperBlazorComponents/SuperBlazorComponents.csproj b/src/SuperBlazorComponents/SuperBlazorComponents.csproj
index f7d28e7..695fb34 100644
--- a/src/SuperBlazorComponents/SuperBlazorComponents.csproj
+++ b/src/SuperBlazorComponents/SuperBlazorComponents.csproj
@@ -1,10 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
 
 	<PropertyGroup>
 		<TargetFramework>net10.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
-		<VersionPrefix>2.0.3</VersionPrefix>
+		<VersionPrefix>2.0.4</VersionPrefix>
 		<GenerateDocumentationFile>false</GenerateDocumentationFile>
 		<RootNamespace>SuperBlazorComponents</RootNamespace>
 		<AssemblyName>SuperBlazorComponents</AssemblyName>
@@ -32,6 +32,9 @@
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
 		<Deterministic>true</Deterministic>
 		<ContinuousIntegrationBuild Condition="'$(CI)' == 'true'">true</ContinuousIntegrationBuild>
+		<DebugSymbols>true</DebugSymbols>
+		<DebugType>portable</DebugType>
+		<CopyOutputSymbolsToOutputDirectory>true</CopyOutputSymbolsToOutputDirectory>
 	</PropertyGroup>
 
   <ItemGroup>