diff --git a/src/lib/Hydra/Controller/Jobset.pm b/src/lib/Hydra/Controller/Jobset.pm
index cd461696..4ddc0ef5 100644
--- a/src/lib/Hydra/Controller/Jobset.pm
+++ b/src/lib/Hydra/Controller/Jobset.pm
@@ -28,8 +28,16 @@ sub index : Chained('jobset') PathPart('') Args(0) {
     
     getBuildStats($c, scalar $c->stash->{jobset}->builds);
 
-    $c->stash->{activeJobs} = [$c->stash->{jobset}->builds->search({isCurrent => 1}, {select => ["job"], distinct => 1})];
-    $c->stash->{inactiveJobs} = [$c->stash->{jobset}->jobs->search({active => 0})];
+    $c->stash->{activeJobs} = [
+        $c->stash->{jobset}->builds->search(
+            {isCurrent => 1},
+            {select => ["job"], order_by => ["job"], distinct => 1}
+        )];
+    $c->stash->{inactiveJobs} = [
+        $c->stash->{jobset}->builds->search(
+            {},
+            {select => ["job"], order_by => ["job"], group_by => ["job"], having => { 'sum(isCurrent)' => 0 }}
+        )];
 }
 
 
diff --git a/src/root/jobset.tt b/src/root/jobset.tt
index 07c6f543..705c08bf 100644
--- a/src/root/jobset.tt
+++ b/src/root/jobset.tt
@@ -126,7 +126,7 @@
 
   <blockquote>
     [% IF inactiveJobs.size == 0 %]<em>(none)</em>[% END %]
-    [% FOREACH j IN inactiveJobs %] [% INCLUDE renderJobName project=project.name jobset=jobset.name job=j.name %] [% END %]
+    [% FOREACH j IN inactiveJobs %] [% INCLUDE renderJobName project=project.name jobset=jobset.name job=j.get_column('job') %] [% END %]
   </blockquote>
 
 </p>