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 04c4cbc2ae..3c4286dd8f 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
@@ -22,7 +22,7 @@
                 @if (Model.Widgets.Count() > 1)
             {
                 <abp-select asp-for="ViewModel.Widget" />
-                <div id="polls">@await Component.InvokeAsync("CmsPolls")</div>
+                <div hidden id="polls">@await Component.InvokeAsync("CmsPolls")</div>
                 <div id="PropertySideId">
                 </div>
                 <button class="btn btn-primary float-end" type="submit" id="save-changes">@L["Add"]</button>
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 83fe4c3685..58764af867 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
@@ -4,7 +4,6 @@ $(function () {
 
         var initModal = function () {
 
-
             $('head').append('<script type="text/javascript" src="/Pages/CmsKit/Polls/Polls.js"></script>');
             $('head').append('<script type="text/javascript" src="/client-proxies/cms-kit-pro-proxy.js"></script>');
             $('head').append('<script type="text/javascript" src="/client-proxies/cms-kit-pro-admin-proxy.js"></script>');
@@ -32,14 +31,13 @@ $(function () {
                 });
             });
 
-            $("#WidgetCode").keyup(function (e) {
-                $("#PropertySideId").html('');
-                let widgetKey = $(this).val();
-                let html = " <input hidden class=\"properties form-control\" value=\"" + widgetKey + "\" id=\"Code\" type=\"text\" />"
-                $("#PropertySideId").append(html);
-            });
-
             $("#save-changes").click(function () {
+                var widgetKey = $('#WidgetCodes option').attr("data-key");
+                if (widgetKey != undefined) {
+                    let html = " <input hidden class=\"properties form-control\" value=\"" + widgetKey + "\" id=\"Code\" type=\"text\" />"
+                    $("#PropertySideId").append(html);
+                }
+
                 var keys = [];
                 var values = [];
                 $(".properties").each(function () {