diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Contents/ContentAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Contents/ContentAdminAppService.cs
index 98cd979dd5..f784b296f8 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Contents/ContentAdminAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Contents/ContentAdminAppService.cs
@@ -25,7 +25,7 @@ public class ContentAdminAppService : CmsKitAdminAppServiceBase, IContentAdminAp
                     new ContentWidgetDto
                     {
                         Key = n.Key,
-                        Details = new WidgetDetailDto() { InternalName = n.Value.InternalName, Name = n.Value.Name },
+                        Details = new WidgetDetailDto() { EditorComponentName = n.Value.InternalName, Name = n.Value.Name },
 
                     }).ToList()
         });
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml
index 10597f19d7..3219538d46 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml
@@ -21,9 +21,10 @@
                 @if (Model.Widgets.Count() > 1)
             {
                 <abp-select asp-for="ViewModel.Widget" />
+
                 foreach (var item in Model.ViewModel.Details)
                 {
-                    <div hidden id="polls">@await Component.InvokeAsync(@item.InternalName)</div>
+                    <div hidden id="editor-@item.Name">@await Component.InvokeAsync(@item.EditorComponentName)</div>
                 }
                 <div class="mb-3" id="PropertySideId">
                 </div>
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml.cs
index 932a91dd37..5b1e8e5ea7 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml.cs
@@ -32,7 +32,7 @@ public class AddWidgetModal : AbpPageModel
             Details = widgets.Items.Select(p => p.Details).ToList()
         };
 
-        Widgets = new List<SelectListItem>() { new("", "") };
+        Widgets = new List<SelectListItem>() { new(string.Empty, string.Empty) };
         Widgets.AddRange(widgets
             .Items
             .Select(w => new SelectListItem(w.Key, w.Details.Name))
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js
index 8e6dfefd91..4cc242c613 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js
@@ -6,32 +6,11 @@ $(function () {
 
             let widgetType;
             $("#ViewModel_Widget").change(function () {
-                widgetType = $("#ViewModel_Widget").find(":selected").text();
+                widgetType = $("#ViewModel_Widget").val();
 
-                $("#PropertySideId").html('');
-                $("#WidgetCodeDiv").hide();
+                $('.widget-detail').attr('hidden', 'true');
 
-                volo.cmsKit.admin.contents.contentAdmin.getWidgets().then(function (data) {
-                    var widgetTypes = data.items.filter(v => v.key === widgetType);
-                    var firstWidgetType = widgetTypes[0];
-                    if (firstWidgetType.key == "Poll") {
-                        $("#polls").removeAttr("hidden");
-                        $("#WidgetCodeDiv").show();
-                    }
-                    else {
-
-                        $("#WidgetCodeDiv").hide();
-
-                        for (const property of firstWidgetType.properties) {
-
-                            let html = "<div class=\"form-group\"> " +
-                                " <label for=\"" + property.key + "\">" + property.name + "</label>" +
-                                " <input class=\"properties form-control\" id=\"" + property.key + "\" type=\"text\" />" +
-                                " </div>";
-                            $("#PropertySideId").append(html);
-                        }
-                    }
-                });
+                $('#editor-' + widgetType).removeAttr('hidden');
             });
 
             $("#save-changes").click(function () {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Contents/WidgetDetailDto.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Contents/WidgetDetailDto.cs
index 5d67ed15cc..d9e00712ff 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Contents/WidgetDetailDto.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Contents/WidgetDetailDto.cs
@@ -6,5 +6,5 @@ namespace Volo.CmsKit.Contents;
 public class WidgetDetailDto
 {
     public string Name { get; set; }
-    public string InternalName { get; set; }
+    public string EditorComponentName { get; set; }
 }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/CmsKitContentWidgetOptions.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/CmsKitContentWidgetOptions.cs
index 8af6f1f2d0..1ff76acf79 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/CmsKitContentWidgetOptions.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/CmsKitContentWidgetOptions.cs
@@ -11,9 +11,9 @@ public class CmsKitContentWidgetOptions
         WidgetConfigs = new();
     }
 
-    public void AddWidget(string widgetKey, string widgetName, string internalWidgetName = null)
+    public void AddWidget(string widgetKey, string widgetName, string editorWidgetName = null)
     {
-        var config = new ContentWidgetConfig(widgetName, internalWidgetName);
+        var config = new ContentWidgetConfig(widgetName, editorWidgetName);
         WidgetConfigs.Add(widgetKey, config);
     }
 }
\ No newline at end of file