diff --git a/src/usr/local/www/firewall_rules.php b/src/usr/local/www/firewall_rules.php
index fea426c6a8..a027510a25 100644
--- a/src/usr/local/www/firewall_rules.php
+++ b/src/usr/local/www/firewall_rules.php
@@ -616,7 +616,6 @@ foreach ($filter_rules_list as $filteri => $filterent):
 		//build Schedule popup box
 		$schedule_span_begin = "";
 		$schedule_span_end = "";
-		$sched_caption_escaped = "";
 		$sched_content = "";
 		$schedstatus = false;
 		$dayArray = array (gettext('Mon'), gettext('Tues'), gettext('Wed'), gettext('Thur'), gettext('Fri'), gettext('Sat'), gettext('Sun'));
@@ -717,10 +716,9 @@ foreach ($filter_rules_list as $filteri => $filterent):
 							$sched_content .= $dayFriendly . "; " . $timeFriendly . "<br />";
 						}
 					}
-					#FIXME
-					$sched_caption_escaped = str_replace("'", "\'", $schedule['descr']);
-					$schedule_span_begin = '<a href="/firewall_schedule_edit.php?id=' . $idx . '" data-toggle="popover" data-trigger="hover focus" title="' . $schedule['name'] . '" data-content="' .
-						$sched_caption_escaped . '" data-html="true">';
+
+					$schedule_span_begin = '<a href="/firewall_schedule_edit.php?id=' . $idx . '" data-toggle="popover" data-trigger="hover focus" title="' . htmlspecialchars($schedule['name']) . '" data-content="' .
+						htmlspecialchars($schedule['descr']) . '" data-html="true">';
 					$schedule_span_end = "</a>";
 				}
 				$idx++;