diff --git a/src/components/sidebarLink.tsx b/src/components/sidebarLink.tsx
index a68820a49e5e22..347ba43f3a6269 100644
--- a/src/components/sidebarLink.tsx
+++ b/src/components/sidebarLink.tsx
@@ -22,10 +22,8 @@ export default ({
   const location = useLocation();
   const isActive = location && location.pathname.indexOf(withPrefix(to)) === 0;
 
-  className += " toc-item";
-  if (isActive || collapsed === false) {
-    className += " toc-visible";
-  }
+  const showSubtree = isActive || collapsed === false;
+  className += "toc-item";
 
   return (
     <li className={className} data-sidebar-branch>
@@ -34,7 +32,7 @@ export default ({
       </SmartLink>
       {title && children && (
         <ul className="list-unstyled" data-sidebar-tree>
-          {children}
+          {showSubtree && children}
         </ul>
       )}
     </li>
diff --git a/src/css/_includes/sidebar.scss b/src/css/_includes/sidebar.scss
index 33e4909771c6c0..826c21ad50f3b7 100644
--- a/src/css/_includes/sidebar.scss
+++ b/src/css/_includes/sidebar.scss
@@ -68,14 +68,9 @@
 }
 
 [data-sidebar-branch] [data-sidebar-branch] > [data-sidebar-tree] {
-  display: none;
   margin-bottom: 0;
 }
 
-[data-sidebar-branch].toc-visible > [data-sidebar-tree] {
-  display: block;
-}
-
 [data-sidebar-link] {
   position: relative;
   line-height: 1.5;