diff --git a/www/include/common/javascript/tool.js b/www/include/common/javascript/tool.js
index f77300061d47b96a74c6106d3d6c5a2ad6bbb52d..ecaaf625bd4e490880f8a344e7127e1768a6f95f 100644
--- a/www/include/common/javascript/tool.js
+++ b/www/include/common/javascript/tool.js
@@ -140,13 +140,16 @@ function toggleDisplay(id)
 function checkUncheckAll(theElement)
 {
     jQuery(theElement).parents('tr').nextAll().find('input[type=checkbox]').each(function() {
+
         if (theElement.checked && !jQuery(this).attr('checked')) {
-            jQuery(this).attr('checked',true);
+            jQuery(this).attr("checked",true).prop("checked", true);
+
             if (typeof(_selectedElem) != 'undefined') {
                 putInSelectedElem(jQuery(this).attr('id'));
             }
         } else if (!theElement.checked && jQuery(this).attr('checked')) {
-            jQuery(this).attr('checked', false);
+            jQuery(this).attr("checked", false).prop("checked", false);
+
             if (typeof(_selectedElem) != 'undefined') {
                 removeFromSelectedElem(jQuery(this).attr('id'));
             }