diff --git a/course/lib.php b/course/lib.php
index 9db5a0b34bd..9233040195b 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -492,7 +492,7 @@ function print_section_block($heading, $course, $section, $mods, $modnames, $mod
         }
     }
     if ($isediting) {
-        $editmenu = popup_form("$CFG->wwwroot/course/mod.php?id=$course->id&section=0&add=", 
+        $editmenu = popup_form("$CFG->wwwroot/course/mod.php?id=$course->id&section=$section->section&add=", 
                    $modnames, "section0", "", get_string("add")."...", "mods", get_string("activities"), true);
         $editmenu = "<DIV ALIGN=right>$editmenu</DIV>";
     } else {
diff --git a/course/topics.php b/course/topics.php
index e8d302bfbfe..d423a3a4f46 100644
--- a/course/topics.php
+++ b/course/topics.php
@@ -102,7 +102,7 @@
     
         if (isediting($course->id)) {
             echo "<DIV ALIGN=right>";
-            popup_form("$CFG->wwwroot/course/mod.php?id=$course->id&section=$topic&add=", 
+            popup_form("$CFG->wwwroot/course/mod.php?id=$course->id&amp;section=$topic&add=", 
                         $modnames, "section$topic", "", "$stradd...", "mods", $stractivities);
             echo "</DIV>";
         }
@@ -166,7 +166,7 @@
 
         if (isediting($course->id)) {
             echo "<DIV ALIGN=right>";
-            popup_form("$CFG->wwwroot/course/mod.php?id=$course->id&section=$section&add=", 
+            popup_form("$CFG->wwwroot/course/mod.php?id=$course->id&amp;section=$section&add=", 
                         $modnames, "section$section", "", "$stradd...", "mods", $stractivities);
             echo "</DIV>";
         }
diff --git a/course/weeks.php b/course/weeks.php
index 7a8455c3757..99da7560f11 100644
--- a/course/weeks.php
+++ b/course/weeks.php
@@ -93,7 +93,7 @@
 
         if (isediting($course->id)) {
             echo "<DIV ALIGN=right>";
-            popup_form("$CFG->wwwroot/course/mod.php?id=$course->id&section=$week&add=", 
+            popup_form("$CFG->wwwroot/course/mod.php?id=$course->id&amp;section=$week&add=", 
                         $modnames, "section$week", "", "$stradd...", "mods", $stractivities);
             echo "</DIV>";
         }
@@ -165,7 +165,7 @@
 
         if (isediting($course->id)) {
             echo "<DIV ALIGN=right>";
-            popup_form("$CFG->wwwroot/course/mod.php?id=$course->id&section=$week&add=", 
+            popup_form("$CFG->wwwroot/course/mod.php?id=$course->id&amp;section=$week&add=", 
                         $modnames, "section$week", "", "$stradd...");
             echo "</DIV>";
         }