diff --git a/packages/vtiger/optional/Webforms.zip b/packages/vtiger/optional/Webforms.zip
index f5af7db95f4f7eae1a5fb31d59c7015d449a2fd7..3303e562363c5befa5e566589ee9c293bc156aa7 100644
Binary files a/packages/vtiger/optional/Webforms.zip and b/packages/vtiger/optional/Webforms.zip differ
diff --git a/pkg/vtiger/modules/Webforms/layouts/v7/modules/Settings/Webforms/FieldsEditView.tpl b/pkg/vtiger/modules/Webforms/layouts/v7/modules/Settings/Webforms/FieldsEditView.tpl
index eb984f467543cee8053abc395f57f676aa949a1b..ba640c9fd209bafa9e47544491cad2c92fb6922e 100644
--- a/pkg/vtiger/modules/Webforms/layouts/v7/modules/Settings/Webforms/FieldsEditView.tpl
+++ b/pkg/vtiger/modules/Webforms/layouts/v7/modules/Settings/Webforms/FieldsEditView.tpl
@@ -115,7 +115,7 @@
                                 {/if}
                                 {if !$FIELD_MODEL->isMandatory(true)}
                                     <div class="pull-right actions">
-                                        <span class="actionImages"><a class="removeTargetModuleField"><i class="icon-remove-sign"></i></a></span>
+                                        <span class="actionImages"><a class="removeTargetModuleField" href="javascript:void(0);"><i class="icon-remove-sign"></i></a></span>
                                     </div>
                                 {/if}
                             </td>
diff --git a/pkg/vtiger/modules/Webforms/layouts/v7/modules/Settings/Webforms/resources/Edit.js b/pkg/vtiger/modules/Webforms/layouts/v7/modules/Settings/Webforms/resources/Edit.js
index 8c2c5c2d2da6e034735b99ad593d865c29ac2e36..ffc2e9b20c5ef66224ab8cdd0ee920b9d0b7251f 100644
--- a/pkg/vtiger/modules/Webforms/layouts/v7/modules/Settings/Webforms/resources/Edit.js
+++ b/pkg/vtiger/modules/Webforms/layouts/v7/modules/Settings/Webforms/resources/Edit.js
@@ -208,8 +208,9 @@ Settings_Vtiger_Edit_Js('Settings_Webforms_Edit_Js', {}, {
 			var containerRow = element.closest('tr');
 			var removedFieldLabel = containerRow.find('td.fieldLabel').text();
 			var selectElement = sourceModuleContainer.find('#fieldsList');
-			var select2Element = vtUtils.showSelect2ElementView(selectElement);
-			select2Element.find('li.select2-search-choice').find('div:contains('+removedFieldLabel+')').closest('li').remove();
+			//x click removes element in select2 automatically (2 actions below is not required)
+			//var select2Element = vtUtils.showSelect2ElementView(selectElement);
+			//select2Element.find('li.select2-search-choice').find('div:contains('+removedFieldLabel+')').closest('li').remove();
 			selectElement.find('option:contains('+removedFieldLabel+')').removeAttr('selected');
 			if(selectElement.val().length == 1){
 				jQuery('#saveFieldsOrder').attr('disabled',true);
@@ -802,4 +803,4 @@ Settings_Vtiger_Edit_Js('Settings_Webforms_Edit_Js', {}, {
         
  	    //this.registerSubmitEvent();
 	}
-})
\ No newline at end of file
+})