diff --git a/grade/grading/form/rubric/edit.php b/grade/grading/form/rubric/edit.php
index 151a06665c9..dee042d737b 100644
--- a/grade/grading/form/rubric/edit.php
+++ b/grade/grading/form/rubric/edit.php
@@ -48,8 +48,11 @@ $PAGE->requires->js('/grade/grading/form/rubric/js/rubriceditor.js');
 //TODO freeze rubric editor if needed
 $mform = new gradingform_rubric_editrubric(null, array('areaid' => $areaid, 'freezerubric' => optional_param('freeze', 0, PARAM_INT)));
 $mform->set_data($controller->get_definition_for_editing());
-if ($mform->is_submitted() && $mform->is_validated()) {
-    $data = $mform->get_data();
+if ($mform->is_cancelled()) {
+    // todo process editing cancel in a better way
+    redirect($manager->get_management_url());
+
+} else if ($data = $mform->get_data()) {
     $data = $controller->postupdate_definition_data($data);
     $controller->update_definition($data);
     redirect($PAGE->url);