diff --git a/admin/settings/grades.php b/admin/settings/grades.php
index d59a089957a..8fb3515ceee 100644
--- a/admin/settings/grades.php
+++ b/admin/settings/grades.php
@@ -112,7 +112,7 @@ if (has_capability('moodle/grade:manage', $systemcontext)
         $defaults['value'] = 0;
         $defaults['forced'] = true;
         $temp->add(new admin_setting_gradecat_combo('grade_keephigh', get_string('keephigh', 'grades'),
-                    get_string('keephighhelp', 'grades'), $defaults, $options));
+                    get_string('keephigh_help', 'grades'), $defaults, $options));
         $defaults['forced'] = false;
         $temp->add(new admin_setting_gradecat_combo('grade_droplow', get_string('droplow', 'grades'),
                     get_string('droplow_help', 'grades'), $defaults, $options));
diff --git a/grade/edit/tree/category_form.php b/grade/edit/tree/category_form.php
index d38cc28fe2b..adcaa8548ae 100644
--- a/grade/edit/tree/category_form.php
+++ b/grade/edit/tree/category_form.php
@@ -85,7 +85,7 @@ class edit_category_form extends moodleform {
         }
 
         $mform->addElement('select', 'keephigh', get_string('keephigh', 'grades'), $options);
-        $mform->setHelpButton('keephigh', array('keephigh', get_string('keephigh', 'grades'), 'grade'), true);
+        $mform->addHelpButton('keephigh', 'keephigh', 'grades');
         if ((int)$CFG->grade_keephigh_flag & 2) {
             $mform->setAdvanced('keephigh');
         }
diff --git a/lang/en/grades.php b/lang/en/grades.php
index 4c4f5e97d10..58cb4650dd4 100755
--- a/lang/en/grades.php
+++ b/lang/en/grades.php
@@ -385,7 +385,7 @@ $string['itemnamehelp'] = 'The name of this item, pushed in by the module.';
 $string['items'] = 'Items';
 $string['itemsedit'] = 'Edit grade item';
 $string['keephigh'] = 'Keep the highest';
-$string['keephighhelp'] = 'If set, this option will only keep the X highest grades, X being the selected value for this option.';
+$string['keephigh_help'] = 'If set, this option will only keep the X highest grades, X being the selected value for this option.';
 $string['keymanager'] = 'Key manager';
 $string['lessthanmin'] = 'The grade entered for {$a->itemname} for {$a->username} is less than the minimum allowed';
 $string['letter'] = 'Letter';
diff --git a/lang/en/help/grade/keephigh.html b/lang/en/help/grade/keephigh.html
deleted file mode 100644
index 33901dbd758..00000000000
--- a/lang/en/help/grade/keephigh.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<h1>Keep the highest</h1>
-<p>If set, this option will only keep the X highest grades, X being the selected value for this option.</p>