diff --git a/module/testreport/js/view.ui.js b/module/testreport/js/view.ui.js
index cc5eafc8ff..ed197ab240 100644
--- a/module/testreport/js/view.ui.js
+++ b/module/testreport/js/view.ui.js
@@ -1,8 +1,8 @@
-$('.nav.nav-tabs').on('show', function(event, info)
+window.handleTabChange = function(event)
 {
-    const tabID = info[1].replaceAll('#', '');
-    $('#' + tabID + ' canvas').each(function()
+    $(event.target).find('[z-use-echarts]').each(function()
     {
-        $(this).parent().parent().data('zui.ECharts').chart.resize();
+        const echart = $(this).zui();
+        if(echart) echart.chart.resize();
     });
-});
+};
diff --git a/module/testreport/ui/view.html.php b/module/testreport/ui/view.html.php
index 9ac03832f7..3f4c649669 100644
--- a/module/testreport/ui/view.html.php
+++ b/module/testreport/ui/view.html.php
@@ -350,6 +350,7 @@ detailBody
         set::className('col gap-1 grow'),
         tabs
         (
+            on::show('.tab-pane')->call('handleTabChange', jsRaw('event')),
             tabPane
             (
                 set::key('basic'),