diff --git a/runbot/static/src/js/stats.js b/runbot/static/src/js/stats.js
index 6c5ae0fb..383f6601 100644
--- a/runbot/static/src/js/stats.js
+++ b/runbot/static/src/js/stats.js
@@ -162,7 +162,7 @@ function fetchUpdateChart() {
 function generateLegend() {
   var legend = $("<ul></ul>");
   for (data of config.data.datasets) {
-    var legendElement = $(`<li><span class="color" style="border: 2px solid ${data.borderColor};"></span><span class="label">${data.label}<span></li>`)
+    var legendElement = $(`<li><span class="color" style="border: 2px solid ${data.borderColor};"></span><span class="label" title="${data.label}">${data.label}<span></li>`)
     if (data.hidden){
       legendElement.addClass('disabled')
     }
@@ -228,6 +228,20 @@ function updateUrl(){
   window.location.hash = new URLSearchParams(config.searchParams).toString();
 }
 
+async function waitForChart() {
+
+  function loop(resolve) {
+    if (window.Chart) {
+      resolve();
+    } else {
+      setTimeout(loop.bind(null, resolve),10);
+    }
+  }
+  return new Promise((resolve) => {
+    loop(resolve);
+  })
+}
+
 window.onload = function() {
     config.searchParams = {
       limit: 25,
@@ -256,6 +270,5 @@ window.onload = function() {
       fetchUpdateChart();
     }
 
-    
-    fetchUpdateChart();
+    waitForChart().then(fetchUpdateChart);
 };
diff --git a/runbot/templates/build_stats.xml b/runbot/templates/build_stats.xml
index 3fef5612..e2d73693 100644
--- a/runbot/templates/build_stats.xml
+++ b/runbot/templates/build_stats.xml
@@ -96,8 +96,8 @@
             </div>
           </nav>
           <div class="row">
-            <div class="col-xs-9 col-md-10 col-lg-11"><canvas id="canvas"></canvas></div>
-            <div class="col-xs-3 col-md-2 col-lg-1">
+            <div class="col-xs-9 col-md-10"><canvas id="canvas"></canvas></div>
+            <div class="col-xs-3 col-md-2">
                 <b>Mode:</b>
                 <select id="mode_selector" class="form-select" aria-label="Display mode">
                   <option title="Real Values ordered by value" selected="selected" value="normal">Value</option>