diff --git a/_includes/navigation.html b/_includes/navigation.html
index 42e1e40763..0b30d9e4c1 100644
--- a/_includes/navigation.html
+++ b/_includes/navigation.html
@@ -3,10 +3,12 @@
 
 {% for path in page_paths %}
     
-    {% assign page = site.pages | where: "path", path | first %}
+    {% assign item = site.pages | where: "path", path | first %}
     
-    {% if page.title %}
-        <a href="{{ page.url | relative_url }}">{{ page.title }}</a>
+    {% if item.title and page.title == item.title %}
+        <a class="nav-active" href="{{ item.url | relative_url }}">{{ item.title }}</a>
+    {% elsif item.title %}
+        <a class="nav-link" href="{{ item.url | relative_url }}">{{ item.title }}</a>
     {% endif %}
 
     
diff --git a/_sass/_header.scss b/_sass/_header.scss
index 9a0d666300..3b1faa0dc7 100644
--- a/_sass/_header.scss
+++ b/_sass/_header.scss
@@ -24,12 +24,19 @@
 
 .site-header nav a:hover,
 .site-header nav a:focus,
-.site-header nav a:active {
+.site-header nav a:active,
+.site-header nav a.nav-active:hover,
+.site-header nav a.nav-active:focus,
+.site-header nav a.nav-active:active {
   color: #444;
   opacity: 1;
   border-bottom: 2px solid #444;
 }
 
+.site-header nav a.nav-active {
+  border-bottom: 1px solid $light-gray;
+}
+
 .site-nav a + a {
   margin-left: 1em;
 }