diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.html b/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.html
index 3061c85d0..e6f581d1c 100644
--- a/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.html
+++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.html
@@ -1,10 +1,12 @@
 <template name="measurementTableView">
     <div class="measurementTableView scrollArea">
-        {{#let config=measurementConfiguration}}
-            {{#each measurementGroup in measurementGroups.get}}
-                {{>measurementTableHeaderRow (clone this
-                    toolGroup=measurementGroup.toolGroup
-                    measurementRows=measurementGroup.measurementRows)}}
+        {{#let config=measurementConfiguration groups=measurementGroups.get}}
+            {{#each measurementGroup in groups}}
+                {{! #if hasMeasurements measurementGroup.toolGroup.id}}
+                    {{>measurementTableHeaderRow (clone this
+                        toolGroup=measurementGroup.toolGroup
+                        measurementRows=measurementGroup.measurementRows)}}
+                {{! /if}}
                 {{#each rowItem in measurementGroup.measurementRows}}
                     {{>measurementTableRow (clone this rowItem=rowItem)}}
                 {{/each}}
@@ -31,6 +33,10 @@
                 {{/let}}
             {{/if}}
         {{/let}}
-        <div class="btn btn-primary js-pdf">Export PDF</div>
+        {{#if or (hasMeasurements 'targets') (hasMeasurements 'nonTargets')}}
+            <div class="report-area">
+                <div class="btn btn-sm js-pdf">Generate Report</div>
+            </div>
+        {{/if}}
     </div>
 </template>
diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.js b/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.js
index 9ee280967..8dd9620aa 100644
--- a/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.js
+++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.js
@@ -24,6 +24,13 @@ Template.measurementTableView.events({
 });
 
 Template.measurementTableView.helpers({
+    hasMeasurements(toolGroupId) {
+        const instance = Template.instance();
+        const groups = instance.data.measurementGroups.get();
+        const group = _.find(groups, item => item.toolGroup.id === toolGroupId);
+        return !!group.measurementRows.length;
+    },
+
     getNewMeasurementType(tool) {
         // TODO: Check Conformance criteria here.
         // RECIST should be nonTargets, irRC should be targets
diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.styl b/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.styl
index 75cfdfc09..edf39f53e 100644
--- a/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.styl
+++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.styl
@@ -13,3 +13,15 @@
 
   &::-webkit-scrollbar
     display: none
+
+  .report-area
+    theme('background-color', '$uiGrayDarker')
+    margin-top: 2px
+    padding: 10px 0
+
+    .btn.js-pdf
+      theme('background-color', '$activeColor')
+      theme('border', '1px solid $uiBorderColorActive')
+      color: #000
+      display: table
+      margin: 0 auto