diff --git a/.gitignore b/.gitignore
index b447a12..25e8803 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 _site
 Gemfile.lock
 node_modules
+.jekyll-metadata
diff --git a/_includes/nav.html b/_includes/nav.html
index d561a42..fdcf1e1 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -10,6 +10,7 @@
             {%- endif -%}
             <a href="{{ node.url | absolute_url }}" class="navigation-list-link{% if page.url == node.url %} active{% endif %}">{{ node.title }}</a>
             {%- if node.has_children -%}
+            {%- if page.url == node.url or page.parent == node.title or page.grand_parent == node.title -%}
               {%- assign children_list = site.html_pages | where: "parent", node.title | sort:"nav_order" -%}
               <ul class="navigation-list-child-list ">
                 {%- for child in children_list -%}
@@ -19,6 +20,7 @@
                     {%- endif -%}
                     <a href="{{ child.url | absolute_url }}" class="navigation-list-link{% if page.url == child.url %} active{% endif %}">{{ child.title }}</a>
                     {%- if child.has_children -%}
+                    {%- if page.url == child.url or page.parent == child.title -%}
                         {%- assign grand_children_list = site.html_pages | where: "parent", child.title | sort:"nav_order" -%}
                         <ul class="navigation-list-child-list">
                         {%- for grand_child in grand_children_list -%}
@@ -28,10 +30,12 @@
                         {%- endfor -%}
                       </ul>
                     {%- endif -%}
+                    {%- endif -%}
                   </li>
                 {%- endfor -%}
               </ul>
             {%- endif -%}
+            {%- endif -%}
           </li>
         {%- endif -%}
       {%- endunless -%}