diff --git a/modules/filter/filter.module b/modules/filter/filter.module
index 66fadcb..99079ba 100644
--- a/modules/filter/filter.module
+++ b/modules/filter/filter.module
@@ -850,7 +850,7 @@ function filter_process_format($element) {
   // Get a list of formats that the current user has access to.
   $formats = filter_formats($user);
   foreach ($formats as $format) {
-    $options[$format->format] = $format->name;
+    $options[$format->format] = check_plain($format->name);
     $element['format']['guidelines'][$format->format] = array(
       '#theme' => 'filter_guidelines',
       '#format' => $format,
diff --git a/modules/filter/filter.pages.inc b/modules/filter/filter.pages.inc
index dbbbe4c..e7ac101 100644
--- a/modules/filter/filter.pages.inc
+++ b/modules/filter/filter.pages.inc
@@ -64,7 +64,7 @@ function theme_filter_tips($variables) {
     foreach ($tips as $name => $tiplist) {
       if ($multiple) {
         $output .= '<div class="filter-type filter-' . drupal_html_class($name) . '">';
-        $output .= '<h3>' . $name . '</h3>';
+        $output .= '<h3>' . check_plain($name) . '</h3>';
       }
 
       if (count($tiplist) > 0) {