diff --git a/src/lib/Hydra/Controller/Project.pm b/src/lib/Hydra/Controller/Project.pm
index 07be4d4a..17ea987d 100644
--- a/src/lib/Hydra/Controller/Project.pm
+++ b/src/lib/Hydra/Controller/Project.pm
@@ -14,6 +14,8 @@ sub projectChain :Chained('/') :PathPart('project') :CaptureArgs(1) {
 
     $c->stash->{project} = $c->model('DB::Projects')->find($projectName);
 
+    $c->stash->{isProjectOwner} = isProjectOwner($c, $c->stash->{project});
+
     notFound($c, "Project ‘$projectName’ doesn't exist.")
         if !$c->stash->{project} && !($c->action->name eq "project" and $c->request->method eq "PUT");
 }
diff --git a/src/root/common.tt b/src/root/common.tt
index 043f84c0..37500bf3 100644
--- a/src/root/common.tt
+++ b/src/root/common.tt
@@ -511,7 +511,7 @@ BLOCK renderJobsetOverview %]
   <tbody>
     [% FOREACH j IN jobsets %]
       [% successrate = 0 %]
-      <tr>
+      <tr class="[% IF j.hidden && !showHidden %] hidden-jobset [% END %] [% IF !j.enabled %] disabled-jobset [% END %]" >
         <td>
           [% IF j.get_column('nrscheduled') > 0 %]
             <img src="[% c.uri_for("/static/images/help_16.png") %]" alt="Scheduled" />
diff --git a/src/root/dashboard-my-jobsets-tab.tt b/src/root/dashboard-my-jobsets-tab.tt
index ab4fff0c..362739e6 100644
--- a/src/root/dashboard-my-jobsets-tab.tt
+++ b/src/root/dashboard-my-jobsets-tab.tt
@@ -7,6 +7,6 @@
 
 [% ELSE %]
 
-  [% INCLUDE renderJobsetOverview showProject=1 %]
+  [% INCLUDE renderJobsetOverview showProject=1 showHidden=1 %]
 
 [% END %]
diff --git a/src/root/project.tt b/src/root/project.tt
index 4c36f3a1..2621560e 100644
--- a/src/root/project.tt
+++ b/src/root/project.tt
@@ -26,14 +26,38 @@
 
 <div class="tab-content">
 
+  <script type="text/javascript">
+    $(document).ready(function() {
+      $('#show-hidden').on('click', function (e) {
+        var show = !$(this).hasClass('active');
+        if (show)
+          $('tr.hidden-jobset').show();
+        else
+          $('tr.hidden-jobset').hide();
+      });
+
+      $('#show-disabled').on('click', function (e) {
+        var show = !$(this).hasClass('active');
+        if (show)
+          $('tr.disabled-jobset').show();
+        else
+          $('tr.disabled-jobset').hide();
+      });
+    });
+  </script>
+
   <div id="tabs-project" class="tab-pane active">
     [% IF project.jobsets %]
-      <p>This project has the following jobsets:</p>
+      <p>This project has the following jobsets:
+      <button id="show-disabled" type="button" class="btn btn-small pull-right active" data-toggle="button">Show disabled jobsets</button>
+      [% IF isProjectOwner %]
+        <button id="show-hidden" type="button" class="btn btn-small pull-right" data-toggle="button">Show hidden jobsets</button>
+      [% END %]
+      </p>
       [% INCLUDE renderJobsetOverview %]
     [% ELSE %]
       <p>No jobsets have been defined yet.</p>
     [% END %]
-
   </div>
 
   <div id="tabs-configuration" class="tab-pane">
diff --git a/src/root/static/css/hydra.css b/src/root/static/css/hydra.css
index b8d9d7b4..acd35d68 100644
--- a/src/root/static/css/hydra.css
+++ b/src/root/static/css/hydra.css
@@ -47,6 +47,10 @@ span.hidden-project a, span.hidden-jobset a {
     color: gray;
 }
 
+tr.hidden-jobset {
+    display: none;
+}
+
 table.info-table th {
     padding-right: 1.0em;
     padding-bottom: 0.2em;