diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index 16a3fd77b32..be74d62f614 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.0.2-beta03</Version>
+    <Version>9.0.2-beta04</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BootstrapBlazor/Components/Dialog/EditDialog.razor b/src/BootstrapBlazor/Components/Dialog/EditDialog.razor
index 6e618d358ed..d3af54e8cfa 100644
--- a/src/BootstrapBlazor/Components/Dialog/EditDialog.razor
+++ b/src/BootstrapBlazor/Components/Dialog/EditDialog.razor
@@ -4,24 +4,26 @@
 @attribute [BootstrapModuleAutoLoader("Dialog/EditDialog.razor.js", AutoInvokeInit = false, AutoInvokeDispose = false)]
 
 <ValidateForm Model="@Model" OnValidSubmit="@OnValidSubmitAsync" DisableAutoSubmitFormByEnter="@DisableAutoSubmitFormByEnter">
-    @if (BodyTemplate != null)
-    {
-        <div class="form-body">
-            @BodyTemplate(Model)
-        </div>
-        <div class="form-footer">
-            @RenderFooter
-        </div>
-    }
-    else
-    {
-        <EditorForm TModel="TModel" Items="Items" ItemChangedType="ItemChangedType" ItemsPerRow="ItemsPerRow" RowType="RowType" LabelAlign="LabelAlign" ShowLabel="ShowLabel" ShowUnsetGroupItemsOnTop="ShowUnsetGroupItemsOnTop">
-            <Buttons>
+    <CascadingValue Value="ItemChangedType" IsFixed="true">
+        @if (BodyTemplate != null)
+        {
+            <div class="form-body">
+                @BodyTemplate(Model)
+            </div>
+            <div class="form-footer">
                 @RenderFooter
-            </Buttons>
-        </EditorForm>
-    }
-    <div class="form-loader fade" id="@Id">
-        <Spinner Color="Color.Primary" />
-    </div>
+            </div>
+        }
+        else
+        {
+            <EditorForm TModel="TModel" Items="Items" ItemChangedType="ItemChangedType" ItemsPerRow="ItemsPerRow" RowType="RowType" LabelAlign="LabelAlign" ShowLabel="ShowLabel" ShowUnsetGroupItemsOnTop="ShowUnsetGroupItemsOnTop">
+                <Buttons>
+                    @RenderFooter
+                </Buttons>
+            </EditorForm>
+        }
+        <div class="form-loader fade" id="@Id">
+            <Spinner Color="Color.Primary" />
+        </div>
+    </CascadingValue>
 </ValidateForm>