diff --git a/mod/scorm/mod_form.php b/mod/scorm/mod_form.php
index ebf10af4505..dc2dcabd48c 100644
--- a/mod/scorm/mod_form.php
+++ b/mod/scorm/mod_form.php
@@ -147,6 +147,7 @@ class mod_scorm_mod_form extends moodleform_mod {
         $mform->addElement('selectyesno', 'hidenav', get_string('hidenav', 'scorm'));
         $mform->setDefault('hidenav', $cfg_scorm->hidenav);
         $mform->setAdvanced('hidenav', $cfg_scorm->hidenav_adv);
+        $mform->disabledIf('hidenav', 'hidetoc', 'noteq', 0);
 
         //-------------------------------------------------------------------------------
         // grade Settings
diff --git a/mod/scorm/module.js b/mod/scorm/module.js
index fd14add7552..fda54ca964d 100644
--- a/mod/scorm/module.js
+++ b/mod/scorm/module.js
@@ -32,7 +32,9 @@ M.mod_scorm.init = function(Y, hide_nav, hide_toc, toc_title, window_name, launc
     var scorm_hide_nav = true;
     var scorm_hide_toc = true;
     if (hide_toc == 0) {
-        scorm_hide_nav = false;
+        if (hide_nav != 1) {
+            scorm_hide_nav = false;
+        }
         scorm_hide_toc = false;
     } else if (hide_toc == 3) {
         scorm_disable_toc = true;