diff --git a/js/functions.js b/js/functions.js
index 8abdc5113..94221b1b6 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -594,10 +594,27 @@ $(document).ready(function() {
      */
     $('tr.odd:not(.noclick), tr.even:not(.noclick)').live('click',function(e) {
         //do not trigger when clicked on anchor or inside input element (in inline editing mode) with exception of the first checkbox
-        if (!jQuery(e.target).is('a, a *, :input:not([name^="rows_to_delete"])')) {
-            var $tr = $(this);
+        if ($(e.target).is('a, a *')) {
+            return;
+        }
+        // XXX: FF fires two click events for <label> (label and checkbox), so we need to handle this differently
+        var $tr = $(this);
+        var $checkbox = $tr.find(':checkbox');
+        if ($checkbox.length) {
+            // checkbox in a row, add or remove class depending on checkbox state
+            var checked = $checkbox.attr('checked');
+            if (!$(e.target).is(':checkbox, label')) {
+                checked = !checked;
+                $checkbox.attr('checked', checked);
+            }
+            if (checked) {
+                $tr.addClass('marked');
+            } else {
+                $tr.removeClass('marked');
+            }
+        } else {
+            // normaln data table, just toggle class
             $tr.toggleClass('marked');
-            $tr.children().toggleClass('marked');
         }
     });
 
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index a0bbfea06..1c9d5f5da 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -206,6 +206,7 @@ table tr.even {
 <?php if ($GLOBALS['cfg']['BrowseMarkerEnable']) { ?>
 /* marked table rows */
 td.marked,
+table tr.marked td,
 table tr.marked th,
 table tr.marked {
     background:   <?php echo $GLOBALS['cfg']['BrowseMarkerBackground']; ?>;
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index 924a729e1..652b441b0 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -356,6 +356,7 @@ table tr.even {
 <?php if ($GLOBALS['cfg']['BrowseMarkerEnable']) { ?>
 /* marked table rows */
 td.marked,
+table tr.marked td,
 table tr.marked th,
 table tr.marked {
     background:  url(./themes/pmahomme/img/marked_bg.png) repeat-x #b6c6d7;