diff --git a/lib/javascript-static.js b/lib/javascript-static.js
index be66be91657..1233a288416 100644
--- a/lib/javascript-static.js
+++ b/lib/javascript-static.js
@@ -1425,7 +1425,7 @@ M.util.help_icon = {
             return;
         }
         this.Y = Y;
-        Y.one('body').delegate('click', this.display, 'span.helplink a', this);
+        Y.one('body').delegate('click', this.display, 'span.helplink a.tooltip', this);
         this.initialised = true;
     },
     add : function(Y, properties) {
diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
index 7159bb867a3..85816b16f38 100644
--- a/lib/outputrenderers.php
+++ b/lib/outputrenderers.php
@@ -1803,7 +1803,7 @@ class core_renderer extends renderer_base {
         // note: this title is displayed only if JS is disabled, otherwise the link will have the new ajax tooltip
         $title = get_string('helpprefix2', '', trim($title, ". \t"));
 
-        $attributes = array('href'=>$url, 'title'=>$title, 'aria-haspopup' => 'true');
+        $attributes = array('href'=>$url, 'title'=>$title, 'aria-haspopup' => 'true', 'class' => 'tooltip');
         $output = html_writer::tag('a', $output, $attributes);
 
         $this->page->requires->js_init_call('M.util.help_icon.setup');