diff --git a/blog/edit.php b/blog/edit.php
index b8686e04b5f..1329c154cb6 100644
--- a/blog/edit.php
+++ b/blog/edit.php
@@ -63,9 +63,13 @@ if ($id) {
 
 $sitecontext = context_system::instance();
 $usercontext = context_user::instance($userid);
-$PAGE->set_context($usercontext);
-$blognode = $PAGE->settingsnav->find('blogadd', null);
-$blognode->make_active();
+if ($modid) {
+    $PAGE->set_context($sitecontext);
+} else {
+    $PAGE->set_context($usercontext);
+    $blognode = $PAGE->settingsnav->find('blogadd', null);
+    $blognode->make_active();
+}
 
 require_login($courseid);
 
diff --git a/blog/index.php b/blog/index.php
index 56ab7eb8b91..4d2209bfea0 100644
--- a/blog/index.php
+++ b/blog/index.php
@@ -63,7 +63,7 @@ if ($entryid and !isset($userid)) {
     $userid = $entry->userid;
 }
 
-if (isset($userid) && empty($courseid)) {
+if (isset($userid) && empty($courseid) && empty($modid)) {
     $context = context_user::instance($userid);
 } else if (!empty($courseid) && $courseid != SITEID) {
     $context = context_course::instance($courseid);