diff --git a/src/BootstrapBlazor.Shared/Samples/EditorForms.razor b/src/BootstrapBlazor.Shared/Samples/EditorForms.razor
index d9b1e62ba00a1d5b11dd5d16ff88cb5e02ef4157..2b8a8ca9e29fea20ce7c64c0123966036b508d38 100644
--- a/src/BootstrapBlazor.Shared/Samples/EditorForms.razor
+++ b/src/BootstrapBlazor.Shared/Samples/EditorForms.razor
@@ -20,13 +20,7 @@
             <FieldItems>
                 <EditorItem @bind-Field="@context.Education" Editable="false" />
                 <EditorItem @bind-Field="@context.Complete" Editable="false" />
-                <EditorItem @bind-Field="@context.Hobby">
-                    <EditTemplate Context="value">
-                        <div class="col-12">
-                            <CheckboxList @bind-Value="@value.Hobby" Items="@Hobbys" />
-                        </div>
-                    </EditTemplate>
-                </EditorItem>
+                <EditorItem @bind-Field="@context.Hobby" Items="@Hobbys" />
             </FieldItems>
             <Buttons>
                 <Button Icon="fa fa-save" Text="@Localizer["ButtonText"]" />
@@ -43,13 +37,7 @@
             <EditorForm Model="@ValidateModel">
                 <FieldItems>
                     <EditorItem @bind-Field="@context.DateTime" Readonly="true" />
-                    <EditorItem @bind-Field="@context.Hobby">
-                        <EditTemplate Context="value">
-                            <div class="col-12">
-                                <CheckboxList @bind-Value="@value.Hobby" Items="@Hobbys" />
-                            </div>
-                        </EditTemplate>
-                    </EditorItem>
+                    <EditorItem @bind-Field="@context.Hobby" Items="@Hobbys" />
                 </FieldItems>
                 <Buttons>
                     <Button ButtonType="ButtonType.Submit" Icon="fa fa-save" Text='@Localizer["ButtonText"]' />