diff --git a/site-publishing/assets/latency.js b/site-publishing/assets/latency.js
index 65acfed107630eef24df488cb3e11bdb29f6dfc0..0c75199110aa011c3e28ba6497a3fa860f994f6e 100644
--- a/site-publishing/assets/latency.js
+++ b/site-publishing/assets/latency.js
@@ -108,7 +108,6 @@ function pw_test_latency_fetch(project, tests_target, plot_target, weeks, defaul
             var option = document.createElement("option");
             option.text = test_name;
             option.value = test_name.trim();
-            option.addEventListener('click', function(e) {pw_latency_plot(e.target.value);});
             select_tests.appendChild(option);
         });
         select_tests.disabled = false;
diff --git a/site/latency.md b/site/latency.md
index 349aa9182f3cdc70da2c5c489eb8720396e4aa75..bc6cf6d04fe6b3c249d569d5e4734c9253cdfe69 100644
--- a/site/latency.md
+++ b/site/latency.md
@@ -7,7 +7,7 @@ This view enables you to visualize the latency between a patch has been sent and
 
 <div class="inline-form">
     Select a project / test to get statistics for:
-    <select id="projects" onchange="pw_test_latency_fetch(this.options[this.selectedIndex].value, 'tests', 'plot', 1);">
+    <select id="projects">
         <option value="" disabled selected hidden>Please select a project</option>
     </select>
     <select id="tests" disabled>
@@ -62,12 +62,12 @@ This view enables you to visualize the latency between a patch has been sent and
     };
 
     // Add all the available projects
-    var e = document.getElementById('projects');
+    var select_projects = document.getElementById('projects');
     for (let p_name in projects) {
         var o = document.createElement("option");
         o.value = p_name;
         o.text = projects[p_name].name;
-        e.appendChild(o);
+        select_projects.appendChild(o);
     }
 
     // If a project has been set in the URL, select it
@@ -76,4 +76,13 @@ This view enables you to visualize the latency between a patch has been sent and
         pw_test_latency_fetch(default_project, 'tests', 'plot', 1, get_url_parameter('test', undefined));
         document.getElementById('projects').value = default_project;
     }
+
+    select_projects.addEventListener('change', function() {
+        pw_test_latency_fetch(this.options[this.selectedIndex].value, 'tests', 'plot', 1);
+    });
+
+    var select_tests = document.getElementById('tests');
+    select_tests.addEventListener('change', function() {
+        pw_latency_plot(this.options[this.selectedIndex].value);
+    });
 </script>