diff --git a/course/rest.php b/course/rest.php
index 9a7a0f4..ee135c7 100644
--- a/course/rest.php
+++ b/course/rest.php
@@ -54,6 +54,7 @@ if (empty($CFG->enablecourseajax)) {
 }
 
 $course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);
+$coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
 // Check user is logged in and set contexts if we are dealing with resource
 if (in_array($class, array('resource'))) {
     $cm = get_coursemodule_from_id(null, $id, $course->id, false, MUST_EXIST);
@@ -61,7 +62,6 @@ if (in_array($class, array('resource'))) {
     $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id);
 } else {
     require_login($course);
-    $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
 }
 require_sesskey();
 
@@ -144,6 +144,10 @@ switch($requestmethod) {
                         $module->id = $cm->instance;
                         $module->name = $title;
                         $DB->update_record($cm->modname, $module);
+
+                        $stringoptions = new stdClass;
+                        $stringoptions->context = $coursecontext;
+                        echo json_encode(array('title' => format_string($module->name, true,  $stringoptions)));
                         break;
                 }
                 rebuild_course_cache($course->id);
diff --git a/course/yui/toolboxes/toolboxes.js b/course/yui/toolboxes/toolboxes.js
index d8e7ad3..82c8f25 100644
--- a/course/yui/toolboxes/toolboxes.js
+++ b/course/yui/toolboxes/toolboxes.js
@@ -570,8 +570,12 @@ YUI.add('moodle-course-toolboxes', function(Y) {
                         'title'   : newtitle,
                         'id'      : this.get_element_id(element)
                     };
-                    this.send_request(data, editbutton);
-                    currenttitle.set('data', newtitle);
+                    var response = this.send_request(data, editbutton);
+                    if (response.title) {
+                        currenttitle.set('data', response.title);
+                    } else {
+                        currenttitle.set('data', oldtitle);
+                    }
                 } else {
                     // Invalid content. Set the title back to it's original contents
                     currenttitle.set('data', oldtitle);