diff --git a/mod/scorm/view.js b/mod/scorm/view.js
index 29e531c..c1709987 100644
--- a/mod/scorm/view.js
+++ b/mod/scorm/view.js
@@ -5,12 +5,13 @@ M.mod_scormform.init = function(Y) {
     var cheight = scormplayerdata.cheight;
     var poptions = scormplayerdata.popupoptions;
     var courseid = scormplayerdata.courseid;
+    var sectionid = scormplayerdata.sectionid;
     var launch = scormplayerdata.launch;
     var currentorg = scormplayerdata.currentorg;
     var sco = scormplayerdata.sco;
     var scorm = scormplayerdata.scorm;
     var launch_url = M.cfg.wwwroot+"/mod/scorm/player.php?a="+scorm+"&currentorg="+currentorg+"&scoid="+sco+"&sesskey="+M.cfg.sesskey;
-    var course_url = M.cfg.wwwroot+"/course/view.php?id="+courseid+"&sesskey="+M.cfg.sesskey;
+    var course_url = M.cfg.wwwroot+"/course/view.php?id="+courseid+"&sectionid="+sectionid+"&sesskey="+M.cfg.sesskey;
 
     if ((cwidth==100) && (cheight==100)) {
         poptions = poptions+',width='+screen.availWidth+',height='+screen.availHeight+',left=0,top=0';
diff --git a/mod/scorm/view.php b/mod/scorm/view.php
index e9027d1..d0bb257 100644
--- a/mod/scorm/view.php
+++ b/mod/scorm/view.php
@@ -83,11 +83,26 @@ if (!empty($scorm->popup)) {
             $launch = true;
         }
     }
+
+    // Redirect back to the section with one section per page ?
+    if (! $coursedisplay = $DB->get_record('course_format_options', array('courseid'=>$scorm->course, 'name'=>'coursedisplay'))) {
+        print_error('courseformatnotfound', 'error', null, 'coursedisplay');
+    }
+
+    if ($coursedisplay->value == COURSE_DISPLAY_MULTIPAGE) {
+        // $cm->section references course_sections(id) NOT course_sections(section).
+        // Better to use this since this takes priority in course view.php.
+        $sectionid = $cm->section;
+    } else {
+        $sectionid = '';
+    }
+
     $PAGE->requires->data_for_js('scormplayerdata', Array('launch' => $launch,
                                                            'currentorg' => $orgidentifier,
                                                            'sco' => $scoid,
                                                            'scorm' => $scorm->id,
                                                            'courseid' => $scorm->course,
+                                                           'sectionid' => $sectionid,
                                                            'cwidth' => $scorm->width,
                                                            'cheight' => $scorm->height,
                                                            'popupoptions' => $scorm->options), true);