diff --git a/_includes/tree.html b/_includes/tree.html
index aae8e36660..85599f73bb 100644
--- a/_includes/tree.html
+++ b/_includes/tree.html
@@ -1,6 +1,7 @@
-{% for item in tree %}{% if item.heading %}{% else %}{% if item.sectiontitle %}<li class="leaf menu-closed"><a href="javascript:void(0)" class="expand-menu "><span class="menu-icon" aria-hidden="true"></span>{{ item.sectiontitle }}</a>
+{% for item in tree %}{% if item.sectiontitle %}{% capture treeString %}{{ item.section | downcase }}{% endcapture %}{% capture pageURLString %}"{{ page.url }}"{% endcapture %}
+<li class="leaf {% if treeString contains pageURLString %}menu-open{% else %}menu-closed{% endif %}"><a href="javascript:void(0)" class="expand-menu "><span class="menu-icon" aria-hidden="true"></span>{{ item.sectiontitle }}</a>
 <ul class="nav-sub">
   {% assign tree = item.section %}{% include tree.html %}
 </ul>
 {% else %}
-    <li class="leaf"><a href="{{ item.path }}" class="{% if item.path == page.url and item.nosync != true %}active currentPage{% endif %}">{{ item.title }}</a></li>{% endif %}{% endif %}{% endfor %}
+    <li class="leaf"><a href="{{ item.path }}" class="{% if item.path == page.url and item.nosync != true %}active currentPage{% endif %}">{{ item.title }}</a></li>{% endif %}{% endfor %}
diff --git a/js/menu.js b/js/menu.js
index 337bc2f105..574820e9db 100644
--- a/js/menu.js
+++ b/js/menu.js
@@ -56,9 +56,6 @@ function hookupTOCEvents()
     }
     return false;
   });
-  $(".currentPage").each(function(){
-    $(this).parentsUntil($('.docsidebarnav_section')).addClass("active").removeClass("menu-closed").addClass("menu-open");
-  });
   $(".left-off-canvas-menu").css("display","block");
   // console.log(metadata);
   $("#st-search-input").on('keyup change', function(e) {