diff --git a/mozilla/webtools/bugzilla/template/en/default/search/form.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/search/form.html.tmpl
index 1df194c3d7a..7bde916c953 100644
--- a/mozilla/webtools/bugzilla/template/en/default/search/form.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/search/form.html.tmpl
@@ -147,7 +147,7 @@ function doOnSelectProduct(selectmode) {
     </td>
     <td>
       [% IF button_name %]
-        <input type="submit" id="[% button_name.replace (' ' , '_') FILTER html %]"
+        <input type="submit" id="[% button_name FILTER css_class_quote %]_top"
                value="[% button_name FILTER html %]">
       [% END %]
     </td>
diff --git a/mozilla/webtools/bugzilla/template/en/default/search/search-report-graph.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/search/search-report-graph.html.tmpl
index 83b916631c1..61dd3b5df6b 100644
--- a/mozilla/webtools/bugzilla/template/en/default/search/search-report-graph.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/search/search-report-graph.html.tmpl
@@ -129,7 +129,7 @@ var queryform = "reportform"
 [% PROCESS search/form.html.tmpl %]
 
 <br>
-<input type="submit" id="[% button_name FILTER html %]"
+<input type="submit" id="[% button_name FILTER css_class_quote %]"
        value="[% button_name FILTER html %]">
 <input type="hidden" name="action" value="wrap">
 <hr>
diff --git a/mozilla/webtools/bugzilla/template/en/default/search/search-report-table.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/search/search-report-table.html.tmpl
index 8c9f2512fb7..55d62a14098 100644
--- a/mozilla/webtools/bugzilla/template/en/default/search/search-report-table.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/search/search-report-table.html.tmpl
@@ -81,7 +81,7 @@ var queryform = "reportform"
 [% PROCESS search/form.html.tmpl %]
 
 <br>
-<input type="submit" id="[% button_name.replace (' ' , '_') FILTER html %]"
+<input type="submit" id="[% button_name FILTER css_class_quote %]"
        value="[% button_name FILTER html %]">
 <input type="hidden" name="format" value="table">
 <input type="hidden" name="action" value="wrap">