diff --git a/main/admin/skills_wheel.php b/main/admin/skills_wheel.php
index df1b9fe674..78256f8c9e 100755
--- a/main/admin/skills_wheel.php
+++ b/main/admin/skills_wheel.php
@@ -90,4 +90,4 @@ $templateName = $tpl->get_template('skill/skill_wheel.tpl');
 $content = $tpl->fetch($templateName);
 
 $tpl->assign('content', $content);
-$tpl->display_no_layout_template();
+$tpl->displaySkillLayout();
diff --git a/main/inc/lib/template.lib.php b/main/inc/lib/template.lib.php
index e9672e42a6..c301816f92 100755
--- a/main/inc/lib/template.lib.php
+++ b/main/inc/lib/template.lib.php
@@ -442,6 +442,15 @@ class Template
         $this->returnResponse($this->params, $template);
     }
 
+    /**
+     * Displays an empty template.
+     */
+    public function displaySkillLayout()
+    {
+        $template = '@ChamiloTheme/Layout/skill_layout.html.twig';
+        $this->returnResponse($this->params, $template);
+    }
+
     /**
      * Sets the footer visibility.
      *
diff --git a/main/template/default/learnpath/view.html.twig b/main/template/default/learnpath/view.html.twig
index 000e1d5549..179dae4930 100644
--- a/main/template/default/learnpath/view.html.twig
+++ b/main/template/default/learnpath/view.html.twig
@@ -66,8 +66,8 @@
             </div>
         {# TOC layout #}
         <div id="toc_id" class="scorm-body" name="toc_name">
-                {% include template ~ '/learnpath/scorm_list.html.twig' %}
-            </div>
+            {% include template ~ '/learnpath/scorm_list.html.twig' %}
+        </div>
         {# end TOC layout #}
         </div>
     </div>
diff --git a/main/template/default/skill/skill_wheel.html.twig b/main/template/default/skill/skill_wheel.html.twig
index 0065f628fd..c450c312bf 100644
--- a/main/template/default/skill/skill_wheel.html.twig
+++ b/main/template/default/skill/skill_wheel.html.twig
@@ -1,4 +1,3 @@
-{% include template ~ '/skill/skill_wheel.js.html.twig' %}
 <script>
     /* Skill search input in the left menu */
     function check_skills_sidebar() {
diff --git a/main/template/default/skill/skill_wheel.js.html.twig b/main/template/default/skill/skill_wheel.js.html.twig
index 698abc767d..98b1ca2358 100644
--- a/main/template/default/skill/skill_wheel.js.html.twig
+++ b/main/template/default/skill/skill_wheel.js.html.twig
@@ -1,7 +1,4 @@
-{# topbar #}
-{% include template ~ "/layout/topbar.html.twig" %}
 <script>
-
 var SkillWheel = {
     currentSkill: null,
     getSkillInfo: function(skillId) {
diff --git a/src/ThemeBundle/Resources/views/Layout/skill_layout.html.twig b/src/ThemeBundle/Resources/views/Layout/skill_layout.html.twig
new file mode 100644
index 0000000000..415617b8a8
--- /dev/null
+++ b/src/ThemeBundle/Resources/views/Layout/skill_layout.html.twig
@@ -0,0 +1,16 @@
+{% extends "@ChamiloTheme/Layout/base-layout.html.twig" %}
+{# overrides everything inside body no-footer no-header #}
+{% block chamilo_wrap %}
+    {# topbar #}
+    {% include "@ChamiloTheme/Layout/topbar.html.twig" %}
+    {% include 'default/skill/skill_wheel.js.html.twig' %}
+    {% include 'default/skill/skill_wheel.html.twig' %}
+    {% autoescape false %}
+        <section id="content-scorm">
+        {{ content }}
+        </section>
+    {% endautoescape %}
+{% endblock %}
+
+{% block chamilo_footer %}
+{% endblock %}