diff --git a/jgiven-html5-report/src/app/index.html b/jgiven-html5-report/src/app/index.html
index c2f581ae1b..ac888d3ca3 100644
--- a/jgiven-html5-report/src/app/index.html
+++ b/jgiven-html5-report/src/app/index.html
@@ -93,14 +93,14 @@
   </span>
   <span bindonce ng-repeat="scenarioCase in scenario.scenarioCases"
         ng-init="step = scenarioCase.steps[$parent.$index]">
-          <span ng-if="step.attachment && !step.attachment.showDirectly">
+          <span ng-if="step.attachment && !step.attachment.showDirectly && (scenario.casesAsTable || scenarioCase.caseNr === case.caseNr )">
             <span aria-haspopup="{{ step.attachment.title ? 'true' : 'false'"
                   class="{{ step.attachment.title ? 'has-tip' : '' }}"
                   tooltip-html-unsafe="{{ step.attachment.title }}"
                   tooltip-popup-delay="250">
               <a target="_blank" href="data/{{ step.attachment.value }}">
                 <i class="fa fa-paperclip"><span class="attachment-index"
-                                                 ng-if="scenario.scenarioCases.length > 1">{{ scenarioCase.caseNr }}</span></i>
+                                                 ng-if="scenario.scenarioCases.length > 1 && scenario.casesAsTable">{{ scenarioCase.caseNr }}</span></i>
               </a>
             </span>
           </span>