diff --git a/lib/weblib.php b/lib/weblib.php
index 7d830c27338..2c0c85a35b0 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -4996,7 +4996,8 @@ function helpbutton ($page, $title='', $module='moodle', $image=true, $linktext=
         $module = 'moodle';
     }
 
-    $tooltip = get_string('helpprefix2', '', trim($title, ". \t"));
+    // Warn users about new window for Accessibility
+    $tooltip = get_string('helpprefix2', '', trim($title, ". \t")) .' ('.get_string('newwindow').')';
 
     $linkobject = '';
 
@@ -5016,8 +5017,6 @@ function helpbutton ($page, $title='', $module='moodle', $image=true, $linktext=
         $linkobject .= $tooltip;
     }
 
-    $tooltip .= ' ('.get_string('newwindow').')';   // Warn users about new window for Accessibility
-
     // fix for MDL-7734
     if ($text) {
         $url = '/help.php?module='. $module .'&text='. s(urlencode($text).'&forcelang='.$forcelang);