diff --git a/mod/folder/edit.php b/mod/folder/edit.php
index af5c7699bfb..9988cc16231 100644
--- a/mod/folder/edit.php
+++ b/mod/folder/edit.php
@@ -39,7 +39,7 @@ require_login($course, false, $cm);
 require_capability('mod/folder:managefiles', $context);
 
 $PAGE->set_url('/mod/folder/edit.php', array('id' => $cm->id));
-$PAGE->set_title($course->shortname.': '.$folder->name);
+$PAGE->set_title($course->shortname . \moodle_page::TITLE_SEPARATOR . $folder->name);
 $PAGE->set_heading($course->fullname);
 $PAGE->set_activity_record($folder);
 $PAGE->set_secondary_active_tab('modulepage');
diff --git a/mod/folder/index.php b/mod/folder/index.php
index d039e609902..7bda0c8100b 100644
--- a/mod/folder/index.php
+++ b/mod/folder/index.php
@@ -46,7 +46,7 @@ $strintro        = get_string('moduleintro');
 $strlastmodified = get_string('lastmodified');
 
 $PAGE->set_url('/mod/folder/index.php', array('id' => $course->id));
-$PAGE->set_title($course->shortname.': '.$strfolders);
+$PAGE->set_title($course->shortname . \moodle_page::TITLE_SEPARATOR . $strfolders);
 $PAGE->set_heading($course->fullname);
 $PAGE->set_secondary_active_tab('coursehome');
 $PAGE->navbar->add($strfolders);
diff --git a/mod/folder/view.php b/mod/folder/view.php
index 0aaa123fc68..c62bc414078 100644
--- a/mod/folder/view.php
+++ b/mod/folder/view.php
@@ -65,7 +65,7 @@ $completion->set_module_viewed($cm);
 
 $PAGE->set_url('/mod/folder/view.php', array('id' => $cm->id));
 
-$PAGE->set_title($course->shortname.': '.$folder->name);
+$PAGE->set_title($course->shortname . \moodle_page::TITLE_SEPARATOR . $folder->name);
 $PAGE->set_heading($course->fullname);
 $PAGE->set_activity_record($folder);