diff --git a/modules/filter.module b/modules/filter.module
index 770911c8783..6d47ba84ea5 100644
--- a/modules/filter.module
+++ b/modules/filter.module
@@ -734,13 +734,15 @@ function theme_filter_tips($tips, $long = false, $extra = '') {
         $output .= '<strong>'. $name .'</strong>:<br />';
       }
 
-      $output .= '<ul class="tips">';
-
+      $tips = '';
       foreach ($tiplist as $tip) {
-        $output .= '<li'. ($long ? ' id="'. $tip['id'] .'">' : '>') . $tip['tip'] . '</li>';
+        $tips .= '<li'. ($long ? ' id="'. $tip['id'] .'">' : '>') . $tip['tip'] . '</li>';
       }
 
-      $output .= '</ul>';
+      if ($tips) {
+      $output .= "<ul class=\"tips\">$tips</ul>";
+      }
+      
       if ($multiple) {
         $output .= '</li>';
       }
diff --git a/modules/filter/filter.module b/modules/filter/filter.module
index 770911c8783..6d47ba84ea5 100644
--- a/modules/filter/filter.module
+++ b/modules/filter/filter.module
@@ -734,13 +734,15 @@ function theme_filter_tips($tips, $long = false, $extra = '') {
         $output .= '<strong>'. $name .'</strong>:<br />';
       }
 
-      $output .= '<ul class="tips">';
-
+      $tips = '';
       foreach ($tiplist as $tip) {
-        $output .= '<li'. ($long ? ' id="'. $tip['id'] .'">' : '>') . $tip['tip'] . '</li>';
+        $tips .= '<li'. ($long ? ' id="'. $tip['id'] .'">' : '>') . $tip['tip'] . '</li>';
       }
 
-      $output .= '</ul>';
+      if ($tips) {
+      $output .= "<ul class=\"tips\">$tips</ul>";
+      }
+      
       if ($multiple) {
         $output .= '</li>';
       }