diff --git a/src/views/diagnosis/diagnosis_show.ms b/src/views/diagnosis/diagnosis_show.ms
index e5c40f91..cc9663df 100644
--- a/src/views/diagnosis/diagnosis_show.ms
+++ b/src/views/diagnosis/diagnosis_show.ms
@@ -8,13 +8,15 @@
 {{#reports}}
 <div class="panel panel-default">
     <div class="panel-heading">
-        <h2 class="panel-title" style="display: inline-block; margin-right: 10px;">{{ description }}</h2>
+        <h2 class="panel-title" style="display: inline-block; margin-right: 10px;">
+        <a data-toggle="collapse" href="#category-{{id}}">{{ description }}</a>
+        </h2>
         {{#if noIssues}}<span class="label label-success">Everything good!</span>{{/if}}
         {{#if errors}}<span class="label label-danger">{{ errors }} errors</span>{{/if}}
         {{#if warnings}}<span class="label label-warning">{{ warnings }} warnings</span>{{/if}}
         <a role="button" category="{{ id }}" class="btn btn-sm btn-info pull-right rerun-diagnosis"><span class="fa-fw fa-refresh"></span> {{t 'rerun_diagnosis'}}</a>
     </div>
-    <div class="panel-body">
+    <div class="panel-body collapse {{#unless noIssues}}in{{/unless}}" id="category-{{id}}">
     <ul class="list-group">
         <p>Last time ran : {{formatRelative time}}</p>
         {{#items}}