diff --git a/course/editsection.php b/course/editsection.php
index c08d2c853fb..c379b08a775 100644
--- a/course/editsection.php
+++ b/course/editsection.php
@@ -148,11 +148,11 @@ if ($mform->is_cancelled()){
 }
 
 // The edit form is displayed for the first time or if there was validation error on the previous step.
-$sectionname  = get_section_name($course, $sectionnum);
-$stredit      = get_string('edita', '', " $sectionname");
-$strsummaryof = get_string('summaryof', '', " $sectionname");
+$sectionname = get_section_name($course, $sectionnum);
+$stredit = get_string('editsectiontitle', '', $sectionname);
+$strsummaryof = get_string('editsectionsettings');
 
-$PAGE->set_title($stredit);
+$PAGE->set_title($stredit . moodle_page::TITLE_SEPARATOR . $course->shortname);
 $PAGE->set_heading($course->fullname);
 $PAGE->navbar->add($stredit);
 echo $OUTPUT->header();
diff --git a/lang/en/deprecated.txt b/lang/en/deprecated.txt
index 396261ebf3c..0420e7779d3 100644
--- a/lang/en/deprecated.txt
+++ b/lang/en/deprecated.txt
@@ -137,3 +137,4 @@ addinganewto,core
 editinga,core
 updatinga,core
 updatingain,core
+summaryof,core
diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index 14dc8c6f19c..3d7e6143021 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -630,6 +630,8 @@ $string['editorsettings'] = 'Editor settings';
 $string['editorshortcutkeys'] = 'Editor shortcut keys';
 $string['editsection'] = 'Edit settings';
 $string['editsectionname'] = 'Edit section name';
+$string['editsectionsettings'] = 'Edit section settings';
+$string['editsectiontitle'] = 'Edit section: {$a}';
 $string['edittitle'] = 'Edit title';
 $string['edittitleinstructions'] = 'Escape to cancel, Enter when finished';
 $string['editthisactivity'] = 'Edit this activity';
@@ -2183,7 +2185,6 @@ $string['subject'] = 'Subject';
 $string['success'] = 'Success';
 $string['successduration'] = 'Success ({$a} seconds)';
 $string['summary'] = 'Summary';
-$string['summaryof'] = 'Summary of {$a}';
 $string['suspended'] = 'Suspended';
 $string['suspendedusers'] = 'Suspended users';
 $string['switchdevicedefault'] = 'Switch to the standard theme';
@@ -2502,3 +2503,4 @@ $string['addinganewto'] = 'Adding a new {$a->what} to {$a->to}';
 $string['editinga'] = 'Editing {$a}';
 $string['updatinga'] = 'Updating: {$a}';
 $string['updatingain'] = 'Updating {$a->what} in {$a->in}';
+$string['summaryof'] = 'Summary of {$a}';