diff --git a/course/view.php b/course/view.php
index 659834c565a..4ecf21dd46c 100644
--- a/course/view.php
+++ b/course/view.php
@@ -227,13 +227,21 @@
         $PAGE->set_button($buttons);
     }
 
+    $editingtitle = '';
+    if ($PAGE->user_is_editing()) {
+        // Append this to the page title's lang string to get its equivalent when editing mode is turned on.
+        $editingtitle = 'editing';
+    }
+
     // If viewing a section, make the title more specific
     if ($section and $section > 0 and course_format_uses_sections($course->format)) {
         $sectionname = get_string('sectionname', "format_$course->format");
         $sectiontitle = get_section_name($course, $section);
-        $PAGE->set_title(get_string('coursesectiontitle', 'moodle', array('course' => $course->fullname, 'sectiontitle' => $sectiontitle, 'sectionname' => $sectionname)));
+        $PAGE->set_title(get_string('coursesectiontitle' . $editingtitle, 'moodle', array(
+            'course' => $course->fullname, 'sectiontitle' => $sectiontitle, 'sectionname' => $sectionname)
+        ));
     } else {
-        $PAGE->set_title(get_string('coursetitle', 'moodle', array('course' => $course->fullname)));
+        $PAGE->set_title(get_string('coursetitle' . $editingtitle, 'moodle', array('course' => $course->fullname)));
     }
 
     $PAGE->set_heading($course->fullname);
diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index 06ef0e173b3..b661fab537f 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -414,7 +414,8 @@ $string['courserestore'] = 'Course restore';
 $string['coursereuse'] = 'Course reuse';
 $string['courses'] = 'Courses';
 $string['coursesectionsummaries'] = 'Course section summaries';
-$string['coursesectiontitle'] = 'Course: {$a->course}, {$a->sectionname}: {$a->sectiontitle}';
+$string['coursesectiontitle'] = '{$a->sectionname}: {$a->sectiontitle} | {$a->course}';
+$string['coursesectiontitleediting'] = 'Edit {$a->sectionname}: {$a->sectiontitle} | {$a->course}';
 $string['coursesettings'] = 'Course default settings';
 $string['coursesmovedout'] = 'Courses moved out from {$a}';
 $string['coursespending'] = 'Courses pending approval';
@@ -428,6 +429,7 @@ $string['coursestart'] = 'Course start';
 $string['coursesummary'] = 'Course summary';
 $string['coursesummary_help'] = 'A short description of your course. The content you add here is searchable.';
 $string['coursetitle'] = 'Course: {$a->course}';
+$string['coursetitleediting'] = 'Edit course: {$a->course}';
 $string['courseupdates'] = 'Course updates';
 $string['coursevisibility'] = 'Course visibility';
 $string['coursevisibility_help'] = '* Show: The course appears in the list of courses and students can access it.