diff --git a/mod/scorm/locallib.php b/mod/scorm/locallib.php
index 28d1303c3c7..424366c63cb 100644
--- a/mod/scorm/locallib.php
+++ b/mod/scorm/locallib.php
@@ -1872,7 +1872,7 @@ function scorm_get_toc($user, $scorm, $cmid, $toclink=TOCJSLINK, $currentorg='',
 
     if ($tocheader) {
         $result->toc = html_writer::start_div('yui3-g-r', array('id' => 'scorm_layout'));
-        $result->toc .= html_writer::start_div('yui3-u-1-5', array('id' => 'scorm_toc'));
+        $result->toc .= html_writer::start_div('yui3-u-1-5 loading', array('id' => 'scorm_toc'));
         $result->toc .= html_writer::div('', '', array('id' => 'scorm_toc_title'));
         $result->toc .= html_writer::start_div('', array('id' => 'scorm_tree'));
     }
@@ -1932,7 +1932,7 @@ function scorm_get_toc($user, $scorm, $cmid, $toclink=TOCJSLINK, $currentorg='',
 
     if ($tocheader) {
         $result->toc .= html_writer::end_div().html_writer::end_div();
-        $result->toc .= html_writer::start_div('', array('id' => 'scorm_toc_toggle'));
+        $result->toc .= html_writer::start_div('loading', array('id' => 'scorm_toc_toggle'));
         $result->toc .= html_writer::tag('button', '', array('id' => 'scorm_toc_toggle_btn')).html_writer::end_div();
         $result->toc .= html_writer::start_div('', array('id' => 'scorm_content'));
         $result->toc .= html_writer::div('', '', array('id' => 'scorm_navpanel'));
diff --git a/mod/scorm/module.js b/mod/scorm/module.js
index 0f7ef36ca4a..b1df94ff049 100644
--- a/mod/scorm/module.js
+++ b/mod/scorm/module.js
@@ -562,6 +562,10 @@ M.mod_scorm.init = function(Y, nav_display, navposition_left, navposition_top, h
             }
         }
 
+        // Basic initialization completed, show the elements.
+        Y.one('#scorm_toc').removeClass('loading');
+        Y.one('#scorm_toc_toggle').removeClass('loading');
+
         // TOC Resize handle.
         var layout_width = parseInt(Y.one('#scorm_layout').getComputedStyle('width'), 10);
         var scorm_resize_handle = new Y.Resize({
diff --git a/mod/scorm/styles.css b/mod/scorm/styles.css
index fc6644b0706..7246048ff75 100644
--- a/mod/scorm/styles.css
+++ b/mod/scorm/styles.css
@@ -138,7 +138,9 @@
 }
 
 #page-mod-scorm-player #scormpage #scorm_toc.disabled,
-#page-mod-scorm-player #scormpage #scorm_toc_toggle.disabled {
+#page-mod-scorm-player #scormpage #scorm_toc.loading,
+#page-mod-scorm-player #scormpage #scorm_toc_toggle.disabled,
+#page-mod-scorm-player #scormpage #scorm_toc_toggle.loading {
     display: none;
 }