diff --git a/lib/form/modgrade.php b/lib/form/modgrade.php
index efa3d6958df..f9c23f9699a 100644
--- a/lib/form/modgrade.php
+++ b/lib/form/modgrade.php
@@ -503,7 +503,8 @@ class MoodleQuickForm_modgrade extends MoodleQuickForm_group {
                             $this->scaleformelement->setValue(($value * -1));
                         } else if ($value > 0) {
                             $this->gradetypeformelement->setValue('point');
-                            $this->maxgradeformelement->setValue($value);
+                            $maxvalue = !empty($this->currentgrade) ? (string)unformat_float($this->currentgrade) : $value;
+                            $this->maxgradeformelement->setValue($maxvalue);
                         }
                     } else {
                         $this->gradetypeformelement->setValue('none');