diff --git a/app/views/guidance_groups/_index_by_theme.html.erb b/app/views/guidance_groups/_index_by_theme.html.erb
index 3c39eff702..fc515c640d 100644
--- a/app/views/guidance_groups/_index_by_theme.html.erb
+++ b/app/views/guidance_groups/_index_by_theme.html.erb
@@ -9,34 +9,48 @@
     </div>
   </div>
   <% guidance_groups_by_theme.each_pair do |guidance_group, theme_hash| %>
+    <% guidances_output = [] %>
     <% theme_hash.each_pair do |theme, guidances| %>
-      <div class="panel panel-default">
-        <div
-          class="heading-button"
-          role="button"
-          data-toggle="collapse"
-          href="<%= "##{guidances.object_id}" %>"
-          aria-expanded="false"
-          aria-controls="<%= "##{guidances.object_id}" %>">
-          <div class="panel-heading" role="tab" id="<%= "panel-heading-#{guidances.object_id}" %>">
-            <h2 class="panel-title">
-              <%= theme.title %>
-              <i class="fa fa-plus pull-right" aria-hidden="true"></i>
-            </h2>
+      <%# if guidances with this theme have not been output %>
+      <% if (guidances.map(&:id) - guidances_output).any? %>
+        <div class="panel panel-default">
+          <div
+            class="heading-button"
+            role="button"
+            data-toggle="collapse"
+            href="<%= "##{guidances.object_id}" %>"
+            aria-expanded="false"
+            aria-controls="<%= "##{guidances.object_id}" %>">
+            <div class="panel-heading" role="tab" id="<%= "panel-heading-#{guidances.object_id}" %>">
+              <h2 class="panel-title">
+                <%= theme.title %>
+                <i class="fa fa-plus pull-right" aria-hidden="true"></i>
+              </h2>
+            </div>
           </div>
-        </div>
-        <div
-          id="<%= "#{guidances.object_id}" %>"
-          class="panel-collapse collapse"
-          role="tabpanel"
-          aria-labelledby="<%= "panel-heading-#{guidances.object_id}" %>">
-          <div class="panel-body">
-            <% guidances.each do |guidance| %>
-              <%= raw(guidance.text) %>
-            <% end %>
+          <div
+            id="<%= "#{guidances.object_id}" %>"
+            class="panel-collapse collapse"
+            role="tabpanel"
+            aria-labelledby="<%= "panel-heading-#{guidances.object_id}" %>">
+            <div class="panel-body">
+              <% multiple = false %>
+              <% guidances.each do |guidance| %>
+                <% if multiple %>
+                  <hr>
+                <% end %>
+                <p>
+                  <% unless guidances_output.include?(guidance.id) %>
+                    <%= raw(guidance.text) %>
+                    <% guidances_output << guidance.id %>
+                    <% multiple = true %>
+                  <% end %>
+                </p>
+              <% end %>
+            </div>
           </div>
         </div>
-      </div>
+      <% end %>
     <% end %>
   <% end %>
 </div>