diff --git a/module/metric/js/preview.ui.js b/module/metric/js/preview.ui.js
index 6365bf38a6..5b6789d18c 100644
--- a/module/metric/js/preview.ui.js
+++ b/module/metric/js/preview.ui.js
@@ -647,6 +647,11 @@ window.messagerWarning = function(message)
     });
 }
 
+window.getTableHeight = function(actual)
+{
+    return $('.table-side').height();
+}
+
 window.setMultiTableHeight = function(contentHeight)
 {
     $('.table-and-charts').css('max-height', 'calc(100% - ' + contentHeight + 'px)');
diff --git a/module/metric/ui/ajaxgettableandcharts.html.php b/module/metric/ui/ajaxgettableandcharts.html.php
index bebac78cc8..e5bf086435 100644
--- a/module/metric/ui/ajaxgettableandcharts.html.php
+++ b/module/metric/ui/ajaxgettableandcharts.html.php
@@ -24,6 +24,7 @@ div
             (
                 $viewType == 'multiple' ? set::height(310) : null,
                 set::bordered(true),
+                set::height(jsRaw('window.getTableHeight')),
                 set::cols($groupHeader),
                 set::data(array_values($groupData)),
                 ($metricRecordType == 'scope' || $metricRecordType == 'scope-date') ? set::footPager(usePager('dtablePager')) : null,
diff --git a/module/metric/ui/previewsingle.html.php b/module/metric/ui/previewsingle.html.php
index 5162d12ded..604af328dd 100644
--- a/module/metric/ui/previewsingle.html.php
+++ b/module/metric/ui/previewsingle.html.php
@@ -360,6 +360,7 @@ div
                     $groupData ? dtable
                     (
                         set::bordered(true),
+                        set::height(jsRaw('window.getTableHeight')),
                         set::cols($groupHeader),
                         set::data(array_values($groupData)),
                         ($metricRecordType == 'scope' || $metricRecordType == 'scope-date') ? set::footPager(usePager('dtablePager')) : null,