diff --git a/mozilla/webtools/bugzilla/buglist.cgi b/mozilla/webtools/bugzilla/buglist.cgi
index 106236175ef..3070fbcec68 100755
--- a/mozilla/webtools/bugzilla/buglist.cgi
+++ b/mozilla/webtools/bugzilla/buglist.cgi
@@ -773,6 +773,7 @@ if (defined $cgi->param('limit')) {
 }
 elsif ($fulltext) {
     $query .= " " . $dbh->sql_limit(200);
+    $vars->{'sorted_by_relevance'} = 1;
 }
 
 
diff --git a/mozilla/webtools/bugzilla/template/en/default/global/messages.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/global/messages.html.tmpl
index 51056ec6c62..e0821688b89 100644
--- a/mozilla/webtools/bugzilla/template/en/default/global/messages.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/global/messages.html.tmpl
@@ -127,8 +127,10 @@
 
   [% ELSIF message_tag == "buglist_sorted_by_relevance" %]
     [% terms.Bugs %] on this list are sorted by relevance, with the most
-    relevant [% terms.bugs %] at the top.  Only the 200 most relevant 
-    [%+ terms.bugs %] are shown.
+    relevant [% terms.bugs %] at the top.
+    [% IF bugs.size == 200 %]
+      Only the 200 most relevant [% terms.bugs %] are shown.
+    [% END %]
 
   [% ELSIF message_tag == "change_columns" %]
     [% title = "Change columns" %]