diff --git a/docs/changelog.rst b/docs/changelog.rst
index b315dce05..91469bb0b 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,17 +5,21 @@ Changelog
 master
 ======
 
+:Date: TBD
+
 New Features
 -------------
 
 Fixes
 -----
 
+* Clicking active menu item no longer makes it look inactive (#306)
 * Fix definition lists looking different with Sphinx 2.0+
 
 Other Changes
 --------------
 
+* Menu items can now expand and collapse regardless of active item
 * Add the ``navigation`` template block around the navigation area.
 
 0.4.3
@@ -26,6 +30,7 @@ Other Changes
 New Features
 -------------
 
+
 Fixes
 -----
 
@@ -34,7 +39,6 @@ Fixes
 * Fix inconsistent font size and line height for autodoc "raises" and "returns" (#267)
 * Fix last_updated notice appearing in same line as copyright notice (#704)
 
-
 Other Changes
 --------------
 
diff --git a/js/theme.js b/js/theme.js
index 30a22872e..3cfeb22d7 100644
--- a/js/theme.js
+++ b/js/theme.js
@@ -91,7 +91,8 @@ function ThemeNav () {
                 $("[data-toggle='wy-nav-shift']").removeClass("shift");
                 $("[data-toggle='rst-versions']").toggleClass("shift");
                 // Handle dynamic display of l3 and l4 nav lists
-                self.toggleCurrent(target);
+                self.setCurrent(target);
+                self.toggleExpanded(target, true);
                 self.hashChange();
             })
             .on('click', "[data-toggle='rst-current-version']", function() {
@@ -114,7 +115,7 @@ function ThemeNav () {
             var link = $(this);
                 expand = $('<span class="toctree-expand"></span>');
             expand.on('click', function (ev) {
-                self.toggleCurrent(link);
+                self.toggleExpanded(link);
                 ev.stopPropagation();
                 return false;
             });
@@ -146,12 +147,14 @@ function ThemeNav () {
             if (link.length > 0) {
                 $('.wy-menu-vertical .current').removeClass('current');
                 link.addClass('current');
-                link.closest('li.toctree-l1').addClass('current');
-                link.closest('li.toctree-l1').parent().addClass('current');
-                link.closest('li.toctree-l1').addClass('current');
-                link.closest('li.toctree-l2').addClass('current');
-                link.closest('li.toctree-l3').addClass('current');
-                link.closest('li.toctree-l4').addClass('current');
+
+                link.closest('li.toctree-l1').addClass('current expanded');
+                link.closest('li.toctree-l1').parent().addClass('current expanded');
+                link.closest('li.toctree-l1').addClass('current expanded');
+                link.closest('li.toctree-l2').addClass('current expanded');
+                link.closest('li.toctree-l3').addClass('current expanded');
+                link.closest('li.toctree-l4').addClass('current expanded');
+
                 link[0].scrollIntoView();
             }
         }
@@ -187,13 +190,24 @@ function ThemeNav () {
         });
     };
 
-    nav.toggleCurrent = function (elem) {
+    nav.toggleExpanded = function (elem, forceExpanded) {
+        var parent_li = elem.closest('li');
+        if (forceExpanded) {
+            parent_li.addClass('expanded');
+        } else {
+            parent_li.toggleClass('expanded');
+        }
+    };
+
+    nav.setCurrent = function (elem) {
         var parent_li = elem.closest('li');
+        // Remove 'current' status from all li at parent level and lower
         parent_li.siblings('li.current').removeClass('current');
         parent_li.siblings().find('li.current').removeClass('current');
         parent_li.find('> ul li.current').removeClass('current');
-        parent_li.toggleClass('current');
-    }
+        // Make our parent 'current'
+        parent_li.addClass('current');
+    };
 
     return nav;
 };
diff --git a/sass/_theme_layout.sass b/sass/_theme_layout.sass
index 17577e67a..bb799894e 100644
--- a/sass/_theme_layout.sass
+++ b/sass/_theme_layout.sass
@@ -52,19 +52,17 @@ html
       border-bottom: solid 1px hsl(0, 0%, 25%)
     &.current
       background: darken($menu-vertical-background-color, 10%)
+    &.current
       a
-        color: $menu-link-medium
         border-right: solid 1px darken($menu-vertical-background-color, 20%)
-        padding: $gutter / 4 $gutter * 1.5
-        &:hover
-          background: darken($menu-vertical-background-color, 15%)
     code
       border: none
       background: inherit
       color: inherit
       padding-left: 0
       padding-right: 0
-    // Expand links
+
+    // Collapse/Expand icons
     span.toctree-expand
       display: block
       float: left
@@ -74,76 +72,67 @@ html
       font-size: .8em
       line-height: 1.6em
       color: darken($menu-link-medium, 20%)
+    &.expanded > a span.toctree-expand
+      @extend .fa-minus-square-o
 
-  // On state for the first level
-  li.on a, li.current > a
-    color: $menu-link-color
+  // Expanded state for the first level
+  li.expanded > a
     padding: $gutter / 4 $gutter
-    font-weight: bold
     position: relative
-    background: $menu-vertical-background-color
     border: none
     padding-left: $gutter -4px
+  // Current/on state for first level
+  li.current > a
+    color: $menu-link-color
+    font-weight: bold
+    background: $menu-vertical-background-color
     +font-smooth
-    &:hover
-      background: $menu-vertical-background-color
-      span.toctree-expand
-        color: $menu-link-medium
-    span.toctree-expand
-      @extend .fa
-      @extend .fa-minus-square-o
-      display: block
-      font-size: .8em
-      line-height: 1.6em
-      color: darken($menu-link-medium, 30%)
-
-  li.toctree-l1.current > a
+  // Background and border for first level when both expanded and current
+  li.toctree-l1.current.expanded > a
     border-bottom: solid 1px darken($menu-vertical-background-color, 20%)
     border-top: solid 1px darken($menu-vertical-background-color, 20%)
+    &:hover
+      border-color: lighten($menu-background-color, 10%)
 
-  // This is the on state for pages beyond second level
-  li.toctree-l2 a, li.toctree-l3 a, li.toctree-l4 a
+  // Menu link color and hover behavior
+  li.toctree-l1.current a, li.toctree-l2.current a, li.toctree-l3.current a, li.toctree-l4.current a
     color: $menu-link-color
-  li.toctree-l1.current li.toctree-l2, li.toctree-l2.current li.toctree-l3
+    &:hover
+      color: $menu-link-light
+      background-color: lighten($menu-background-color, 10%)
+
+  // Colored background when current
+  li.toctree-l2.current a
+    background: darken($menu-vertical-background-color, 20%)
+  li.toctree-l3.current a
+    background: darken($menu-vertical-background-color, 25%)
+
+  // Collapse/expand behavior
+  li.expanded > ul
+    display: block
+  li > ul
+    margin-bottom: 0
+    display: none
+  li.toctree-l1.expanded li.toctree-l2, li.toctree-l2.expanded li.toctree-l3
     > ul
       display: none
-    &.current > ul
-      display: block
-  li.toctree-l2
-    &.current
-      > a
-        background: darken($menu-vertical-background-color, 20%)
-        padding: $gutter / 4 $gutter * 1.5
-      li.toctree-l3 > a
+    &.expanded
+      > ul
         display: block
-        background: darken($menu-vertical-background-color, 20%)
-        padding: $gutter / 4 $gutter * 2.5
-    a:hover span.toctree-expand
-      color: $menu-link-medium
-    span.toctree-expand
-      color: darken($menu-vertical-background-color, 35%)
+
+  // Font size and indentation for levels > 1
+  li.toctree-l2
+    > a
+      padding: $gutter / 4 $gutter * 1.5
   li.toctree-l3
     font-size: .9em
-    &.current
-      > a
-        background: darken($menu-vertical-background-color, 25%)
-        padding: $gutter / 4 $gutter * 2.5
-      li.toctree-l4 > a
-        display: block
-        background: darken($menu-vertical-background-color, 25%)
-        padding: $gutter / 4 $gutter * 3.5
-    a:hover span.toctree-expand
-      color: $menu-link-medium
-    span.toctree-expand
-      color: darken($menu-vertical-background-color, 40%)
+    > a
+      padding: $gutter / 4 $gutter * 2.5
   li.toctree-l4
     font-size: .9em
+    > a
+      padding: $gutter / 4 $gutter * 3.5
 
-  li.current ul
-    display: block
-  li ul
-    margin-bottom: 0
-    display: none
   li ul li a
     margin-bottom: 0
     color: $menu-link-light