diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index 8e0be08ceb4e3acad198cbc252bc37b18d42cb7c..77bd285d3c672366175682fe7c3295b1bc5aae33 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -423,9 +423,8 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         }
 
         // highlight?
-        if(($item['type']=='d' &&
-            $item['id'] == $this->ns) ||
-            $item['id'] == $ID) $cl = ' cur';
+        if( ($item['type']=='d' && $item['id'] == $this->ns) ||
+            ($item['type']!='d' && $item['id'] == $ID)) $cl = ' cur';
 
         // namespace or page?
         if($item['type']=='d'){
diff --git a/lib/plugins/acl/script.js b/lib/plugins/acl/script.js
index 01f9d12bc6d25071d2dd06af6b42a2f2b7b4fb46..7ab83db585852e020f3b5cbc24f1828259410d10 100644
--- a/lib/plugins/acl/script.js
+++ b/lib/plugins/acl/script.js
@@ -131,8 +131,10 @@ acl = {
             acl.treetoggle(e.target);
         } else if(e.target.href){ // is it a link?
             // remove highlighting
-            var obj = getElementsByClass('cur',$('acl__tree'),'a')[0];
-            if(obj) obj.className = obj.className.replace(/ cur/,'');
+            var obj = getElementsByClass('cur',$('acl__tree'),'a');
+            for(var i=0; i<obj.length; i++){
+                obj[i].className = obj[i].className.replace(/ cur/,'');
+            }
 
             // add new highlighting
             e.target.className += ' cur';