diff --git a/lib/templates/chart.mustache b/lib/templates/chart.mustache
index 40736dde947..34867354670 100644
--- a/lib/templates/chart.mustache
+++ b/lib/templates/chart.mustache
@@ -40,14 +40,14 @@ require([
         uniqid = "{{uniqid}}",
         chartArea = $('#chart-area-' + uniqid),
         chartImage = chartArea.find('.chart-image'),
-        chartTable = chartArea.find('.chart-table-data');
+        chartTable = chartArea.find('.chart-table-data'),
         chartLink = chartArea.find('.chart-table-expand a');
     Builder.make(data).then(function(ChartInst) {
         new Output(chartImage, ChartInst);
         new OutputTable(chartTable, ChartInst);
     });
 
-    chartArea.find('.chart-table-expand a').first().click(function(e) {
+    chartLink.on('click', function(e) {
         e.preventDefault();
         if (chartTable.is(':visible')) {
             chartTable.hide();
diff --git a/mod/feedback/tests/behat/behat_mod_feedback.php b/mod/feedback/tests/behat/behat_mod_feedback.php
index 5c46245057e..1f0a898240b 100644
--- a/mod/feedback/tests/behat/behat_mod_feedback.php
+++ b/mod/feedback/tests/behat/behat_mod_feedback.php
@@ -138,14 +138,15 @@ class behat_mod_feedback extends behat_base {
 
         $feedbackxpath = "//th[contains(normalize-space(string(.)), \"" . $feedbackname . "\")]/ancestor::table/" .
             "following-sibling::div[contains(concat(' ', normalize-space(@class), ' '), ' chart-area ')][1]" .
-            "//p[contains(concat(' ', normalize-space(@class), ' '), ' chart-table-expand ')]";
+            "//p[contains(concat(' ', normalize-space(@class), ' '), ' chart-table-expand ') and ".
+            "//a[contains(normalize-space(string(.)), '".get_string('showchartdata')."')]]";
 
         $charttabledataxpath = $feedbackxpath .
             "/following-sibling::div[contains(concat(' ', normalize-space(@class), ' '), ' chart-table-data ')][1]";
 
         // If chart data is not visible then expand.
         $node = $this->get_selected_node("xpath_element", $charttabledataxpath);
-        if (!$node->isVisible()) {
+        if ($node && !$node->isVisible()) {
             $this->execute('behat_general::i_click_on_in_the', array(
                 get_string('showchartdata'),
                 'link',