diff --git a/ChangeLog b/ChangeLog
index 499088e6aa..25978c36b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog
 4.4.13.0 (not yet released)
 - issue #1808 "Improve table structure" generates invalid SQL
 - bug         Once checked "Show only active" checkbox is always checked
+- issue #1813 Delete rows using "Check All" is broken
 
 4.4.12.0 (2015-07-20)
 - bug       Saved chart image does not have a proper name or an extension
@@ -214,7 +215,7 @@ phpMyAdmin - ChangeLog
 + rfe       Change tracking activation status from db level tracking page
 + rfe #1207 Export users associated with a specific schema/database
 + rfe #1575 "Disable database expansion" : unclear directive name and
-explanation 
+explanation
 + rfe #1607 Tool tip for lock icon when making changes to a page
 + rfe #1327 Hide 'Add user' link if user does not have privileges
 + rfe #501  Support for SSL GRANT option
@@ -305,7 +306,7 @@ explanation
 - bug #4717 Database navigation menu broken when resolution/screen is changing
 - bug #4727 Collation column missing in database list when DisableIS is true
 - bug       Undefined index central_columnswork
-- bug       Undefined index favorite_tables 
+- bug       Undefined index favorite_tables
 
 4.3.7.0 (2015-01-15)
 - bug #4694 js error on marking table as favorite in Safari (in private mode)
diff --git a/js/functions.js b/js/functions.js
index d5f662858c..f4a9fd1466 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -778,7 +778,8 @@ AJAX.registerOnload('functions.js', function () {
      */
 
     $(document).on('click', 'input:checkbox.checkall', function (e) {
-        var $tr = $(this).closest('tr');
+        $this = $(this);
+        var $tr = $this.closest('tr');
 
         // make the table unselectable (to prevent default highlighting when shift+click)
         //$tr.parents('table').noSelect();
@@ -787,25 +788,15 @@ AJAX.registerOnload('functions.js', function () {
             // usual click
 
             // XXX: FF fires two click events for <label> (label and checkbox), so we need to handle this differently
-            var $checkbox = $tr.find(':checkbox');
-            if ($checkbox.length) {
-                // checkbox in a row, add or remove class depending on checkbox state
-                var checked = $checkbox.prop('checked');
-                if (!$(e.target).is(':checkbox, label')) {
-                    checked = !checked;
-                    $checkbox.prop('checked', checked).trigger('change');
-                }
-                if (checked) {
-                    $tr.addClass('marked');
-                } else {
-                    $tr.removeClass('marked');
-                }
-                last_click_checked = checked;
+            var $checkbox = $tr.find(':checkbox.checkall');
+            var checked = $this.prop('checked');
+            $checkbox.prop('checked', checked).trigger('change');
+            if (checked) {
+                $tr.addClass('marked');
             } else {
-                // normal data table, just toggle class
-                $tr.toggleClass('marked');
-                last_click_checked = false;
+                $tr.removeClass('marked');
             }
+            last_click_checked = checked;
 
             // remember the last clicked row
             last_clicked_row = last_click_checked ? $('tr.odd:not(.noclick), tr.even:not(.noclick)').index($tr) : -1;