diff --git a/course/format/weeks/format.js b/course/format/weeks/format.js
index 1c36994e3bf..69a287d2935 100644
--- a/course/format/weeks/format.js
+++ b/course/format/weeks/format.js
@@ -42,6 +42,14 @@ M.course.format.swap_sections = function(Y, node1, node2) {
     var sectionlist = Y.Node.all('.'+CSS.COURSECONTENT+' '+M.course.format.get_section_selector(Y));
     // Swap menus.
     sectionlist.item(node1).one('.'+CSS.SECTIONADDMENUS).swap(sectionlist.item(node2).one('.'+CSS.SECTIONADDMENUS));
+
+    if (sectionlist.item(node1).hasClass('current')) {
+        sectionlist.item(node1).removeClass('current');
+        sectionlist.item(node2).addClass('current');
+    } else if (sectionlist.item(node2).hasClass('current')) {
+        sectionlist.item(node2).removeClass('current');
+        sectionlist.item(node1).addClass('current');
+    }
 }
 
 /**