diff --git a/src/root/edit-jobset.tt b/src/root/edit-jobset.tt
index 30b9a4c9..7dd910ee 100644
--- a/src/root/edit-jobset.tt
+++ b/src/root/edit-jobset.tt
@@ -47,7 +47,7 @@
       <tr><th></th><th>Input name</th><th>Type</th><th style="width: 50%">Value</th><th>Notify committers</th></tr>
     </thead>
     <tbody class="inputs">
-      [% inputs = createFromEval ? eval.jobsetevalinputs : jobset.jobsetinputs; FOREACH input IN inputs %]
+      [% inputs = createFromEval ? eval.jobsetevalinputs : jobset.jobsetinputs; FOREACH input IN inputs.sort('name') %]
         [% INCLUDE renderJobsetInput input=input baseName="input-$input.name" %]
       [% END %]
       <tr>
diff --git a/src/root/jobset.tt b/src/root/jobset.tt
index 283d1a25..38eb4559 100644
--- a/src/root/jobset.tt
+++ b/src/root/jobset.tt
@@ -33,7 +33,7 @@
       <tr><th>Input name</th><th>Type</th><th>Values</th></tr>
     </thead>
     <tbody class="inputs">
-      [% FOREACH input IN jobset.jobsetinputs %]
+      [% FOREACH input IN jobset.jobsetinputs.sort('name') %]
         [% INCLUDE renderJobsetInput input=input baseName="input-$input.name" %]
       [% END %]
     </tbody>