diff --git a/ChangeLog b/ChangeLog
index 6eb16fb75e..d80efaf287 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -83,6 +83,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
diff --git a/js/functions.js b/js/functions.js
index ee4a39d6e3..eef5a1cff4 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -861,8 +861,9 @@ AJAX.registerOnload('functions.js', function () {
      */
 
     $(document).on('click', 'input:checkbox.checkall', function (e) {
-        var $tr = $(this).closest('tr');
-        var $table = $(this).closest('table');
+        $this = $(this);
+        var $tr = $this.closest('tr');
+        var $table = $this.closest('table');
 
         // make the table unselectable (to prevent default highlighting when shift+click)
         //$tr.parents('table').noSelect();
@@ -871,21 +872,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');
-                }
-                $tr.toggleClass('marked', checked);
-                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 ? $table.find('tr.odd:not(.noclick), tr.even:not(.noclick)').index($tr) : -1;