diff --git a/layouts/partials/sidebar/render-tree-branch-without-leaf.html b/layouts/partials/sidebar/render-tree-branch-without-leaf.html
new file mode 100644
index 0000000..b3e316a
--- /dev/null
+++ b/layouts/partials/sidebar/render-tree-branch-without-leaf.html
@@ -0,0 +1,15 @@
+{{- $entry := . -}}
+
+<div class="pt-1 ltr:pr-0 overflow-hidden transition-all ease-in-out duration-200">
+  <ul class='relative flex flex-col gap-1 before:absolute before:inset-y-1 before:w-px before:bg-gray-200 before:content-[""] ltr:ml-3 ltr:pl-3 ltr:before:left-0 rtl:mr-3 rtl:pr-3 rtl:before:right-0 dark:before:bg-neutral-800'>
+    {{- range $entry }}
+      {{- $shouldOpen := .open | default false }}
+      <li class="flex flex-col gap-1 {{ if $shouldOpen }}open{{ end }}">
+        {{- template "sidebar-item-link" (dict "context" . "active" false "title" .title "link" .link) -}}
+        {{- if .section -}}
+          {{- partial "sidebar/render-tree-branch-without-leaf" .section -}}
+        {{- end -}}
+      </li>
+    {{- end -}}
+  </ul>
+</div>
diff --git a/layouts/partials/sidebar/render-tree.html b/layouts/partials/sidebar/render-tree.html
index ac4c075..a4d5f5f 100644
--- a/layouts/partials/sidebar/render-tree.html
+++ b/layouts/partials/sidebar/render-tree.html
@@ -3,11 +3,16 @@
 {{- $pageLink := .page.RelPermalink -}}
 {{- range .tree -}}
   {{- $active := eq $pageLink .link -}}
-  {{- $shouldOpen := or (.open) (hasPrefix $pageLink .link) $active | default true }}
+  {{- $containsPage := hasPrefix $pageLink .link -}}
+  {{- $shouldOpen := or (.open) $containsPage $active | default false }}
   <li class="{{ if $shouldOpen }}open{{ end }}">
     {{- template "sidebar-item-link" (dict "context" . "active" $active "title" .title "link" .link) -}}
     {{- if .section -}}
-      {{- partial "sidebar/render-tree-branch" (dict "context" $context "entry" .section "page" $page) -}}
+      {{- if not $containsPage -}}
+        {{- partialCached "sidebar/render-tree-branch-without-leaf" .section .section -}}
+      {{- else -}}
+        {{- partial "sidebar/render-tree-branch" (dict "context" $context "entry" .section "page" $page) -}}
+      {{- end -}}
     {{- end -}}
   </li>
 {{ end }}