diff --git a/course/renderer.php b/course/renderer.php
index fbdf92235aa..4e097d14d60 100644
--- a/course/renderer.php
+++ b/course/renderer.php
@@ -66,7 +66,7 @@ class core_course_renderer extends plugin_renderer_base {
 
         // Generate an id and the required JS call to make this a nice widget
         $id = html_writer::random_id('course_category_tree');
-        $this->page->requires->js_init_call('M.util.init_toggle_class_on_click', array($id, '.category.with_children', 'collapsed'));
+        $this->page->requires->js_init_call('M.util.init_toggle_class_on_click', array($id, '.category.with_children .category_label', 'collapsed'));
 
         // Start content generation
         $content = html_writer::start_tag('div', array('class'=>'course_category_tree', 'id'=>$id));
diff --git a/lib/javascript-static.js b/lib/javascript-static.js
index 1776d3ac2fe..f2a746bbba4 100644
--- a/lib/javascript-static.js
+++ b/lib/javascript-static.js
@@ -411,8 +411,8 @@ M.util.init_toggle_class_on_click = function(Y, id, cssselector, toggleclassname
     node.all(cssselector).each(function(node){
         node.on('click', function(e){
             e.stopPropagation();
-            if (e.target.get('nodeName')!='A' && e.target.get('nodeName')!='IMG') {
-                this.toggleClass(toggleclassname);
+            if (e.target.test(cssselector) && e.target.get('nodeName')!='A' && e.target.get('nodeName')!='IMG') {
+                this.ancestor().toggleClass(toggleclassname);
             }
         }, node);
     });
@@ -1538,7 +1538,7 @@ M.util.init_mp3flowplayer = function (id, playerpath, audioplayerpath, fileurl,
                     },
                     audio: {url: audioplayerpath}
             },
-            clip: { url: fileurl,
+            clip: {url: fileurl,
                     provider: "audio",
                     autoPlay: false
             }
@@ -1565,7 +1565,7 @@ M.util.init_mp3flowplayerplugin = function (id, playerpath, audioplayerpath, fil
                     },
                     audio: {url: audioplayerpath}
             },
-            clip: { url: fileurl,
+            clip: {url: fileurl,
                     provider: "audio",
                     autoPlay: false
             }