diff --git a/templates/nav.html b/templates/nav.html
index 4e91a79..95a83fa 100644
--- a/templates/nav.html
+++ b/templates/nav.html
@@ -1,9 +1,12 @@
+{% if page %}
+{% set page_section = get_section(path=page.ancestors[1], metadata_only = true) %}
+{% endif %}
 <nav>
   <menu>
     <li><a {% if section and section == root %} class="nav_current" {% endif %} href="/">Home</a></li>
     {% for subsection in root.subsections %}
     {% set subsection = get_section(path=subsection, metadata_only=true) %}
-    <li><a href="{{ subsection.permalink }}" {% if section and section == subsection %} class="nav_current" {% endif %}>{{ subsection.title }}</a></li>
+    <li><a href="{{ subsection.permalink }}" {% if section and section.title == subsection.title or page and page_section.title == subsection.title %} class="nav_current" {% endif %}>{{ subsection.title }}</a></li>
     {% endfor %}
   </menu>
 </nav>