diff --git a/mod/scorm/module.js b/mod/scorm/module.js
index 201cc9b3c31..9b4cd6617c8 100644
--- a/mod/scorm/module.js
+++ b/mod/scorm/module.js
@@ -802,6 +802,9 @@ M.mod_scorm.connectPrereqCallback = {
             }
             var el_new_tree = document.createElement('div');
             var pagecontent = document.getElementById("page-content");
+            if (!pagecontent) {
+                pagecontent = document.getElementById("content");
+            }
             el_new_tree.setAttribute('id','scormtree123');
             el_new_tree.innerHTML = o.responseText;
             // Make sure it does not show.
diff --git a/theme/base/layout/embedded.php b/theme/base/layout/embedded.php
index f0f3818f178..45bc0a4950e 100644
--- a/theme/base/layout/embedded.php
+++ b/theme/base/layout/embedded.php
@@ -36,7 +36,7 @@ echo $OUTPUT->doctype(); ?>
 
 <!-- END OF HEADER -->
 
-    <div id="content" class="clearfix">
+    <div id="page-content" class="clearfix">
         <?php echo $OUTPUT->main_content() ?>
     </div>
 
diff --git a/theme/base/style/core.css b/theme/base/style/core.css
index 4e1d38d7e3d..ba9e7ebbdbd 100644
--- a/theme/base/style/core.css
+++ b/theme/base/style/core.css
@@ -1211,7 +1211,7 @@ x#fitem_id_availabilityconditionsjson input[type=text] {
 audio.mediaplugin_html5audio {width: 300px}
 
 /* TinyMCE moodle media preview frame should not have padding */
-.core_media_preview.pagelayout-embedded #content {padding:0;}
+.core_media_preview.pagelayout-embedded #page-content {padding:0;}
 .core_media_preview.pagelayout-embedded #maincontent {height:0;}
 .core_media_preview.pagelayout-embedded .mediaplugin {margin:0;}
 
diff --git a/theme/canvas/layout/embedded.php b/theme/canvas/layout/embedded.php
index d5b41183bf3..716cd88acdd 100644
--- a/theme/canvas/layout/embedded.php
+++ b/theme/canvas/layout/embedded.php
@@ -36,7 +36,7 @@ echo $OUTPUT->doctype() ?>
 
 <!-- END OF HEADER -->
 
-    <div id="content" class="clearfix">
+    <div id="page-content" class="clearfix">
         <?php echo $OUTPUT->main_content() ?>
     </div>
 
diff --git a/theme/canvas/style/core.css b/theme/canvas/style/core.css
index ea06004a7a4..bec35d3258c 100644
--- a/theme/canvas/style/core.css
+++ b/theme/canvas/style/core.css
@@ -473,7 +473,7 @@ body {
     background-image: none;
 }
 
-.pagelayout-embedded #content {
+.pagelayout-embedded #page-content {
     padding-top: 30px;
 }
 
diff --git a/theme/upgrade.txt b/theme/upgrade.txt
index 6a9bdba4c65..8c9d3768232 100644
--- a/theme/upgrade.txt
+++ b/theme/upgrade.txt
@@ -2,7 +2,8 @@ This files describes API changes in /theme/* themes,
 information provided here is intended especially for theme designer.
 
 === 2.8 ===
-
+* Themes Base and Canvas layout/embedded.php has changed.
+  The div id="content" has been changed to id="page-content" - see MDL-47915.
 * All mod_assign CSS selectors have been qualified with ".path-mod-assign". This means any custom CSS
   rules for mod_assign in a theme may need to be updated.
 * The following render methods were renamed, if you have overridden any of these you will need to update your renderer: