diff --git a/firewall/index.cgi b/firewall/index.cgi
index b6be05d45..f04136b85 100755
--- a/firewall/index.cgi
+++ b/firewall/index.cgi
@@ -223,7 +223,8 @@ else {
 					push(@cols, &describe_rule($r));
 					}
 				if ($config{'view_comment'}) {
-					$cmt = $config{'comment_mod'} ?
+					$cmt = $config{'comment_mod'} ||
+					       $r->{'comment'} ?
 					    $r->{'comment'}->[1] : $r->{'cmt'};
 					push(@cols, $cmt);
 					}