diff --git a/filter/activitynames/filter.php b/filter/activitynames/filter.php
index 8683a69df0b..21c37582580 100644
--- a/filter/activitynames/filter.php
+++ b/filter/activitynames/filter.php
@@ -35,7 +35,7 @@
                         /// Avoid empty or unlinkable activity names
                         if (!empty($title)) {
                             $title = str_replace('"', "'", $title);
-                            $href_tag_begin = "<a class=\"autolink\" title=\"$title\" href=\"$CFG->wwwroot/mod/$activity->mod/view.php?id=$activity->cm\">";
+                            $href_tag_begin = "<a class=\"autolink\" title=\"$title\" href=\"$CFG->wwwroot/mod/$activity->mod/view.php?id=$activity->cm\" target=\"$CFG->framename\">";
                             $currentname = urldecode($activity->name);
                             if ($currentname = trim($currentname)) {
                                 $activitylist[] = new filterobject($currentname, $href_tag_begin, '</a>', false, true);
diff --git a/mod/resource/filter.php b/mod/resource/filter.php
index b5b1c0c74d6..33103379473 100644
--- a/mod/resource/filter.php
+++ b/mod/resource/filter.php
@@ -39,7 +39,7 @@
                 if (!empty($strippedname)) {
                     $resourcelist[] = new filterobject($currentname,
                             '<a class="resource autolink" title="'.$strippedname.'" href="'.
-                             $CFG->wwwroot.'/mod/resource/view.php?r='.$resource->id.'">', 
+                             $CFG->wwwroot.'/mod/resource/view.php?r='.$resource->id.'" target="'.$CFG->framename.'">', 
                              '</a>', false, true);
                 }
             }