diff --git a/Havit.Blazor.Components.Web.Bootstrap/Navigation/HxSidebarItem.razor b/Havit.Blazor.Components.Web.Bootstrap/Navigation/HxSidebarItem.razor
index 8b882a320..51783e8b4 100644
--- a/Havit.Blazor.Components.Web.Bootstrap/Navigation/HxSidebarItem.razor
+++ b/Havit.Blazor.Components.Web.Bootstrap/Navigation/HxSidebarItem.razor
@@ -85,7 +85,7 @@
 						   Enabled="Enabled"
 						   OnClick="HandleExpandableItemClick"
 						   role="button"
-						   data-bs-toggle="collapse"
+						   data-bs-toggle="@(expanded && !String.IsNullOrEmpty(Href) ? null : "collapse")"
 						   data-bs-target="@("#" + _id)"
 						   aria-expanded="@(expanded ? "true" : "false")">
 
diff --git a/Havit.Blazor.Documentation/Pages/Components/HxSidebarDoc/HxSidebar_Demo.razor b/Havit.Blazor.Documentation/Pages/Components/HxSidebarDoc/HxSidebar_Demo.razor
index 610b7f3a8..575454664 100644
--- a/Havit.Blazor.Documentation/Pages/Components/HxSidebarDoc/HxSidebar_Demo.razor
+++ b/Havit.Blazor.Documentation/Pages/Components/HxSidebarDoc/HxSidebar_Demo.razor
@@ -1,23 +1,23 @@
 <HxSidebar>
-    <HeaderTemplate>
-        <HxSidebarBrand BrandName="Brand name" BrandNameShort="BN"/>
-    </HeaderTemplate>
+	<HeaderTemplate>
+		<HxSidebarBrand BrandName="Brand name" BrandNameShort="BN" />
+	</HeaderTemplate>
 
-    <ItemsTemplate>
-		<HxSidebarItem Text="Dashboard" Href="TEST" Icon="BootstrapIcon.Columns" TooltipText="Dashboard" />
+	<ItemsTemplate>
+		<HxSidebarItem Text="Dashboard" Href="/components/HxSidebar/dashboard" Icon="BootstrapIcon.Columns" TooltipText="Dashboard" />
 		<HxSidebarItem Text="Employees (plain)" Icon="BootstrapIcon.People" TooltipText="Employees (plain)">
-            <HxSidebarItem Text="Overview" Href="/HxSidebarTest#x1" Match="NavLinkMatch.All"/>
-            <HxSidebarItem Text="Absences" Href="TEST"/>
-        </HxSidebarItem>
-        <HxSidebarItem Text="Mine (with icons)" Href="TEST" Icon="BootstrapIcon.Person">
-            <HxSidebarItem Text="Overview" Icon="BootstrapIcon.Wallet2" Href="#"/>
-            <HxSidebarItem Text="Timesheets" Icon="BootstrapIcon.Clock"Href="TEST"/>
-            <HxSidebarItem Text="Absences" Icon="BootstrapIcon.Exclamation" Href="TEST"/>
-        </HxSidebarItem>
-        <HxSidebarItem Text="Administration" Href="TEST" Icon="BootstrapIcon.Gear"/>
-    </ItemsTemplate>
+			<HxSidebarItem Text="Overview" Href="/components/HxSidebar/employees" Match="NavLinkMatch.All" />
+			<HxSidebarItem Text="Absences" Href="/components/HxSidebar/absences" />
+		</HxSidebarItem>
+		<HxSidebarItem Text="Mine (with icons)" Href="/components/HxSidebar/mine" Icon="BootstrapIcon.Person">
+			<HxSidebarItem Text="Overview" Icon="BootstrapIcon.Wallet2" Href="/components/HxSidebar/mine" Match="NavLinkMatch.All" />
+			<HxSidebarItem Text="Timesheets" Icon="BootstrapIcon.Clock" Href="/components/HxSidebar/mine/timesheets" />
+			<HxSidebarItem Text="Absences" Icon="BootstrapIcon.Exclamation" Href="/components/HxSidebar/mine/absences" />
+		</HxSidebarItem>
+		<HxSidebarItem Text="Administration" Href="/components/HxSidebar/admin" Icon="BootstrapIcon.Gear" />
+	</ItemsTemplate>
 
-    <FooterTemplate>
-        <HxSidebarFooter Href="/login" Icon="BootstrapIcon.Person" Text="@(context.SidebarCollapsed ? null : "Login")"/>
-    </FooterTemplate>
+	<FooterTemplate>
+		<HxSidebarFooter Href="/components/HxSidebar/login" Icon="BootstrapIcon.Person" Text="@(context.SidebarCollapsed ? null : "Login")" />
+	</FooterTemplate>
 </HxSidebar>
\ No newline at end of file
diff --git a/Havit.Blazor.Documentation/Pages/Components/HxSidebarDoc/HxSidebar_Documentation.razor b/Havit.Blazor.Documentation/Pages/Components/HxSidebarDoc/HxSidebar_Documentation.razor
index ebb962b5b..21cd3d6fc 100644
--- a/Havit.Blazor.Documentation/Pages/Components/HxSidebarDoc/HxSidebar_Documentation.razor
+++ b/Havit.Blazor.Documentation/Pages/Components/HxSidebarDoc/HxSidebar_Documentation.razor
@@ -1,4 +1,5 @@
 @attribute [Route("/components/" + nameof(HxSidebar))]
+@attribute [Route("/components/" + nameof(HxSidebar) + "/{*RouteCatchAll}")]
 @attribute [Route("/components/" + nameof(HxSidebarItem))]
 @attribute [Route("/components/" + nameof(HxSidebarBrand))]
 
@@ -192,4 +193,8 @@
 </ComponentApiDoc>
 
 <ComponentApiDoc Type="typeof(HxSidebarItem)" />
-<ComponentApiDoc Type="typeof(HxSidebarBrand)" />
\ No newline at end of file
+<ComponentApiDoc Type="typeof(HxSidebarBrand)" />
+
+@code {
+	[Parameter] public string RouteCatchAll { get; set; } // for the demos
+}
\ No newline at end of file