diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index 70b6ca7f9..2f8d41a74 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -25,11 +25,11 @@
   {{ $refMenu := (index .Site.Menus (print (replaceRE "[.]" "_" $currentVersion) "_ref")) }}
 
   <!-- Main Section -->
-  {{ partial "sidebar/nested-menu" (dict "page" $currentPage "menu" $mainMenu) }}
+  {{ partial "sidebar/nested-menu" (dict "page" $currentPage "menu" $mainMenu) . }}
 
   <!-- Reference Section -->
   <h4 class="reference">Reference</h4>
-  {{ partial "sidebar/nested-menu" (dict "page" $currentPage "menu" $refMenu) }}
+  {{ partial "sidebar/nested-menu" (dict "page" $currentPage "menu" $refMenu) . }}
 
   </ul>
 </aside>
diff --git a/layouts/partials/sidebar/nested-menu.html b/layouts/partials/sidebar/nested-menu.html
index 866fc74da..2cc4b7d08 100644
--- a/layouts/partials/sidebar/nested-menu.html
+++ b/layouts/partials/sidebar/nested-menu.html
@@ -1,40 +1,44 @@
 {{ $page := .page }}
 {{ $menu := .menu }}
 
+{{ define "productTag" }}
+  {{ if and (.Page.Params.products) (not .Page.Parent.Params.products) }}{{ range .Page.Params.products }}<span class="{{ . }}"></span>{{ end }}{{ end }}
+{{ end }}
+
 {{ range $menu }}
   <li class="nav-category {{ if eq $page.RelPermalink .URL }}active{{end}}">
     {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
-    <a href="{{ .URL }}">{{ .Name }} {{ if .Page.Params.products }}{{ range .Page.Params.products }}<span class="{{ . }}"></span>{{ end }}{{ end }}</a>
+    <a href="{{ .URL }}">{{ .Name }} {{ template "productTag" . }}</a>
     {{ if .HasChildren }}
       <ul class="children {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}">
       {{ range .Children }}
         <li class="nav-item {{ if eq $page.RelPermalink .URL }}active{{end}}">
           {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
-          <a href="{{ .URL }}">{{ .Name }} {{ if and (.Page.Params.products) (not .Page.Parent.Params.products) }}{{ range .Page.Params.products }}<span class="{{ . }}"></span>{{ end }}{{ end }}</a>
+          <a href="{{ .URL }}">{{ .Name }} {{ template "productTag" . }}</a>
           {{ if .HasChildren }}
             <ul class="children {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}">
             {{ range .Children }}
               <li class="nav-item {{ if eq $page.RelPermalink .URL }}active{{end}}">
                 {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
-                <a href="{{ .URL }}">{{ .Name }} {{ if and (.Page.Params.products) (not .Page.Parent.Params.products) }}{{ range .Page.Params.products }}<span class="{{ . }}"></span>{{ end }}{{ end }}</a>
+                <a href="{{ .URL }}">{{ .Name }} {{ template "productTag" . }}</a>
                 {{ if .HasChildren }}
                   <ul class="children {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}">
                   {{ range .Children }}
                     <li class="nav-item {{ if eq $page.RelPermalink .URL }}active{{end}}">
                       {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
-                      <a href="{{ .URL }}">{{ .Name }} {{ if and (.Page.Params.products) (not .Page.Parent.Params.products) }}{{ range .Page.Params.products }}<span class="{{ . }}"></span>{{ end }}{{ end }}</a>
+                      <a href="{{ .URL }}">{{ .Name }} {{ template "productTag" . }}</a>
                       {{ if .HasChildren }}
                         <ul class="children {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}">
                         {{ range .Children }}
                           <li class="nav-item {{ if eq $page.RelPermalink .URL }}active{{end}}">
                             {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
-                            <a href="{{ .URL }}">{{ .Name }} {{ if and (.Page.Params.products) (not .Page.Parent.Params.products) }}{{ range .Page.Params.products }}<span class="{{ . }}"></span>{{ end }}{{ end }}</a>
+                            <a href="{{ .URL }}">{{ .Name }} {{ template "productTag" . }}</a>
                             {{ if .HasChildren }}
                               <ul class="children {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}">
                               {{ range .Children }}
                                 <li class="nav-item {{ if eq $page.RelPermalink .URL }}active{{end}}">
                                   {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
-                                  <a href="{{ .URL }}">{{ .Name }} {{ if and (.Page.Params.products) (not .Page.Parent.Params.products) }}{{ range .Page.Params.products }}<span class="{{ . }}"></span>{{ end }}{{ end }}</a>
+                                  <a href="{{ .URL }}">{{ .Name }} {{ template "productTag" . }}</a>
 
                                   <!-- Begin nested block -->
                                   {{ if .HasChildren }}
@@ -42,7 +46,7 @@
                                     {{ range .Children }}
                                       <li class="nav-item {{ if eq $page.RelPermalink .URL }}active{{end}}">
                                         {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
-                                        <a href="{{ .URL }}">{{ .Name }} {{ if and (.Page.Params.products) (not .Page.Parent.Params.products) }}{{ range .Page.Params.products }}<span class="{{ . }}"></span>{{ end }}{{ end }}</a>
+                                        <a href="{{ .URL }}">{{ .Name }} {{ template "productTag" . }}</a>
                                         <!-- To add more nested layers, copy the nested block and paste it here -->
                                       </li>
                                     {{ end }}