diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index d7b84e4d7b4..18b67acd46e 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.6.1-beta03</Version>
+    <Version>9.6.1</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BootstrapBlazor/Components/FullScreen/FullScreenButton.razor.scss b/src/BootstrapBlazor/Components/FullScreen/FullScreenButton.razor.scss
index db5692c7a8f..3fdaefd12d9 100644
--- a/src/BootstrapBlazor/Components/FullScreen/FullScreenButton.razor.scss
+++ b/src/BootstrapBlazor/Components/FullScreen/FullScreenButton.razor.scss
@@ -6,7 +6,7 @@
     display: inline-block;
 }
 
-:not(:root):fullscreen {
+:fullscreen {
     .bb-fs-on {
         display: inline-block;
     }
diff --git a/src/BootstrapBlazor/Components/Tab/Tab.razor b/src/BootstrapBlazor/Components/Tab/Tab.razor
index c029317034c..b7b4796c7c7 100644
--- a/src/BootstrapBlazor/Components/Tab/Tab.razor
+++ b/src/BootstrapBlazor/Components/Tab/Tab.razor
@@ -87,8 +87,7 @@ else
                     @if (ShowFullscreenToolbarButton)
                     {
                         <div class="tabs-nav-toolbar-button tabs-nav-toolbar-fs">
-                            <FullScreenButton TargetId="@Id"
-                                              Icon="@FullscreenToolbarButtonIcon"
+                            <FullScreenButton Icon="@FullscreenToolbarButtonIcon"
                                               TooltipText="@FullscreenToolbarTooltipText"
                                               TooltipPlacement="Placement.Bottom" TooltipTrigger="hover"></FullScreenButton>
                         </div>
@@ -194,7 +193,7 @@ else
         {
             @if (ShowFullScreen && item.ShowFullScreen)
             {
-                <FullScreenButton TargetId="@GetIdByTabItem(item)"></FullScreenButton>
+                <FullScreenButton></FullScreenButton>
             }
             @if (ShowClose && item.Closable)
             {
diff --git a/src/BootstrapBlazor/Components/Tab/Tab.razor.cs b/src/BootstrapBlazor/Components/Tab/Tab.razor.cs
index b7ddb2237a3..49fd1d762e8 100644
--- a/src/BootstrapBlazor/Components/Tab/Tab.razor.cs
+++ b/src/BootstrapBlazor/Components/Tab/Tab.razor.cs
@@ -1059,8 +1059,6 @@ public async Task DragItemCallback(int originIndex, int currentIndex)
         }
     }
 
-    private string GetIdByTabItem(TabItem item) => ComponentIdGenerator.Generate(item);
-
     private async Task OnRefreshAsync()
     {
         // refresh the active tab item
@@ -1120,10 +1118,7 @@ private Task OnCloseAll(ContextMenuItem item, object? context)
 
     private async Task OnFullScreen(ContextMenuItem item, object? context)
     {
-        if (context is TabItem tabItem)
-        {
-            await FullScreenService.ToggleById(GetIdByTabItem(tabItem));
-        }
+        await FullScreenService.ToggleById();
     }
 
     private async Task OnContextMenu(MouseEventArgs e, TabItem item)
diff --git a/src/BootstrapBlazor/Extensions/FullScreenServiceExtensions.cs b/src/BootstrapBlazor/Extensions/FullScreenServiceExtensions.cs
index 22dacc58911..308a7b95d6a 100644
--- a/src/BootstrapBlazor/Extensions/FullScreenServiceExtensions.cs
+++ b/src/BootstrapBlazor/Extensions/FullScreenServiceExtensions.cs
@@ -24,5 +24,5 @@ public static class FullScreenServiceExtensions
     /// <param name="id"></param>
     /// <param name="service"></param>
     /// <returns></returns>
-    public static Task ToggleById(this FullScreenService service, string id) => service.Toggle(new() { Id = id });
+    public static Task ToggleById(this FullScreenService service, string? id = null) => service.Toggle(new() { Id = id });
 }