diff --git a/modules/widget/tpl/js/generate_code.js b/modules/widget/tpl/js/generate_code.js
index 17a47f5c3..02e81d759 100644
--- a/modules/widget/tpl/js/generate_code.js
+++ b/modules/widget/tpl/js/generate_code.js
@@ -106,6 +106,8 @@ function doFillWidgetVars() {
         var node = obj_list[j];
         if(node.name.indexOf('_')==0) continue;
         if(node.name == 'widgetstyle') continue;
+        if(node.type == 'button') continue;
+        if(node.name == '') continue;
 
         var length = node.length;
         var type = node.type;
diff --git a/modules/widget/tpl/js/widget.js b/modules/widget/tpl/js/widget.js
index 1336760b5..9212eba69 100644
--- a/modules/widget/tpl/js/widget.js
+++ b/modules/widget/tpl/js/widget.js
@@ -63,7 +63,7 @@ function doStartPageModify(zoneID, module_srl) {
 function removeAllWidget() {
     if(!confirm(confirm_delete_msg)) return;
 	restoreWidgetButtons();
-	xInnerHtml(zonePageObj,'');
+	jQuery(zonePageObj).html('');
 }
 
 /**