diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html
index 967fc6c0061..3049b1472e8 100644
--- a/layouts/partials/menu.html
+++ b/layouts/partials/menu.html
@@ -97,18 +97,25 @@ <h3>{{ if not $disableShortcutsTitle}}{{ T "Shortcuts-Title"}}{{ end }}</h3>
  {{with .sect}}
   {{if .IsSection}}
     {{safeHTML .Params.head}}
-    <li data-nav-id="{{.RelPermalink}}" title="{{.Title}}" class="dd-item 
-        {{if .IsAncestor $currentNode }}parent{{end}}
+    {{ $isParent := or (.IsAncestor $currentNode) (.Params.alwaysopen) }}
+    {{ $numberOfPages := (add (len .Pages) (len .Sections)) }}
+    <li data-nav-id="{{.URL}}" title="{{.Title}}" class="dd-item 
+    {{if $isParent }}parent{{end}}	
         {{if eq .File.UniqueID $currentNode.File.UniqueID}}active{{end}}
-        {{if .Params.alwaysopen}}parent{{end}}
         ">
       <a href="{{.RelPermalink}}">
           {{safeHTML .Params.Pre}}{{or .Params.menuTitle .LinkTitle .Title}}{{safeHTML .Params.Post}}
+          {{ if and (ne $numberOfPages 0) (ne .Parent .Site.Home) }}
+            {{if $isParent }}
+              <i class="fas fa-caret-down"></i>
+            {{ else }}
+              <i class="fas fa-caret-right"></i>
+            {{ end }}
+          {{ end }}
           {{ if $showvisitedlinks}}
-            <i class="fas fa-check read-icon"></i>
+            <i class="fas read-icon"></i>
           {{ end }}
       </a>
-      {{ $numberOfPages := (add (len .Pages) (len .Sections)) }}
       {{ if ne $numberOfPages 0 }}
         <ul>
           {{ $currentNode.Scratch.Set "pages" .Pages }}
diff --git a/static/css/theme.css b/static/css/theme.css
index 2e1f65ef3c5..124dfadc97a 100644
--- a/static/css/theme.css
+++ b/static/css/theme.css
@@ -262,7 +262,11 @@ textarea:focus, input[type="email"]:focus, input[type="number"]:focus, input[typ
     padding-bottom: 0;
 }
 #sidebar ul.topics li.parent ul, #sidebar ul.topics > li.active ul {
-    display: block;
+    display: none;
+}
+
+nav#sidebar ul.topics li.parent > ul {
+	display: block;
 }
 #sidebar ul.topics > li > a {
     line-height: 2rem;