diff --git a/src/DemoWebSite/Components/Pages/SuperLayoutDemo.razor b/src/DemoWebSite/Components/Pages/SuperLayoutDemo.razor
index fc035fd..20dfca7 100644
--- a/src/DemoWebSite/Components/Pages/SuperLayoutDemo.razor
+++ b/src/DemoWebSite/Components/Pages/SuperLayoutDemo.razor
@@ -75,7 +75,7 @@
                     <div class="p-3">
                         <div style="border: 1px solid #dee2e6; border-radius: 0.5rem; overflow: hidden; min-height: 250px;">
                             <SuperLayout Style="position: relative; height: 250px;">
-                                <SuperHeader BrandText="My App" ShowSidebarToggle="false" />
+                                <SuperHeader BrandText="My App" ShowToggle="false" />
                                 <SuperBody>
                                     <p>Body content without sidebar</p>
                                 </SuperBody>
@@ -173,7 +173,7 @@
         """
         <SuperLayout>
             <SuperHeader BrandText="My App"
-                         ShowSidebarToggle="false" />
+                         ShowToggle="false" />
             <SuperBody>
                 <p>Body content without sidebar</p>
             </SuperBody>
diff --git a/src/SuperBlazorComponents/Components/SuperDataGrid/SuperDataGrid.razor.Selection.cs b/src/SuperBlazorComponents/Components/SuperDataGrid/SuperDataGrid.razor.Selection.cs
index 156a083..7c42bd3 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/SuperBlazorComponents.csproj b/src/SuperBlazorComponents/SuperBlazorComponents.csproj
index 462e134..f7d28e7 100644
--- a/src/SuperBlazorComponents/SuperBlazorComponents.csproj
+++ b/src/SuperBlazorComponents/SuperBlazorComponents.csproj
@@ -4,7 +4,7 @@
 		<TargetFramework>net10.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
-		<VersionPrefix>2.0.2</VersionPrefix>
+		<VersionPrefix>2.0.3</VersionPrefix>
 		<GenerateDocumentationFile>false</GenerateDocumentationFile>
 		<RootNamespace>SuperBlazorComponents</RootNamespace>
 		<AssemblyName>SuperBlazorComponents</AssemblyName>