diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index d4e6cd0bbda..0b000d5cc42 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.4.9-beta04</Version>
+    <Version>9.4.9-beta05</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BootstrapBlazor/Components/Label/BootstrapLabel.razor b/src/BootstrapBlazor/Components/Label/BootstrapLabel.razor
index e2cc22ec2e0..702fd315ef3 100644
--- a/src/BootstrapBlazor/Components/Label/BootstrapLabel.razor
+++ b/src/BootstrapBlazor/Components/Label/BootstrapLabel.razor
@@ -3,7 +3,7 @@
 
 @if (_showTooltip)
 {
-    <Tooltip Title="@Value">
+    <Tooltip Title="@Value" class="form-label-tooltip">
         @RenderLabel
     </Tooltip>
 }
diff --git a/src/BootstrapBlazor/Components/Row/Row.razor.scss b/src/BootstrapBlazor/Components/Row/Row.razor.scss
index c29d63338c1..9418e967a29 100644
--- a/src/BootstrapBlazor/Components/Row/Row.razor.scss
+++ b/src/BootstrapBlazor/Components/Row/Row.razor.scss
@@ -47,5 +47,9 @@
         &.form-inline-center > div > .form-label {
             text-align: center;
         }
+
+        .form-label-tooltip + * {
+            flex: 1;
+        }
     }
 }