diff --git a/webtools/bugzilla/query.cgi b/webtools/bugzilla/query.cgi
index 8afb327e9327..daae265d7250 100755
--- a/webtools/bugzilla/query.cgi
+++ b/webtools/bugzilla/query.cgi
@@ -282,6 +282,7 @@ $vars->{'bug_severity'} = \@::legal_severity;
 my @fields;
 push(@fields, { name => "noop", description => "---" });
 push(@fields, $dbh->bz_get_field_defs());
+@fields = sort {lc($a->{'description'}) cmp lc($b->{'description'})} @fields;
 $vars->{'fields'} = \@fields;
 
 # Creating new charts - if the cmd-add value is there, we define the field
diff --git a/webtools/bugzilla/template/en/default/search/form.html.tmpl b/webtools/bugzilla/template/en/default/search/form.html.tmpl
index c3b4d8bcb65c..879625d02c2f 100644
--- a/webtools/bugzilla/template/en/default/search/form.html.tmpl
+++ b/webtools/bugzilla/template/en/default/search/form.html.tmpl
@@ -589,11 +589,17 @@ function doOnSelectProduct(selectmode) {
     <label for="chfield">where one or more of the following changed</label>:
   </dt>
   <dd>
-    <select name="chfield" id="chfield" multiple="multiple" size="4">
+    [%# Create array, so we can sort it by description #%]
+    [% chfields = [] %]
     [% FOREACH field = chfield %]
-      <option value="[% field FILTER html %]"
-        [% " selected" IF lsearch(default.chfield, field) != -1 %]>
-        [% (field_descs.$field || field) FILTER html %]</option>
+      [% chfields.push({value => field, desc => (field_descs.$field || field) }) %]
+    [% END %]
+
+    <select name="chfield" id="chfield" multiple="multiple" size="4">
+    [% FOREACH field = chfields.sort('desc') %]
+      <option value="[% field.value FILTER html %]"
+        [% " selected" IF lsearch(default.chfield, field.value) != -1 %]>
+        [% field.desc FILTER html %]</option>
     [% END %]
     </select>
   </dd>