diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index af18100501..ef40e6d5e4 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -44,7 +44,8 @@
         {{- end }}
         {{- $defaultDisableToc := .Site.Params.disableToc | default false }}
         {{- $currentDisableToc := .Params.disableToc | default $defaultDisableToc }}
-        {{- $toc := (and (not $currentDisableToc) (not .Params.chapter)) }}
+        {{- $hastoc := not (eq 0 (int (len (.TableOfContents | plainify)))) }}
+        {{- $toc := (and $hastoc (not $currentDisableToc) (not .Params.chapter)) }}
           <div id="breadcrumbs">
             <span id="sidebar-toggle-span">
               <a href="#" id="sidebar-toggle" title='{{ T "Navigation-toggle" }}' data-sidebar-toggle="">
diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html
index d9f8d31dc3..7ed997b5bc 100644
--- a/layouts/partials/menu.html
+++ b/layouts/partials/menu.html
@@ -57,7 +57,7 @@
         {{- $themevariants := slice | append .Site.Params.themeVariant }}
         {{- $showthemeswitch := gt (int (len $themevariants)) 1 }}
         {{- $footer := partial "menu-footer.html" . }}
-        {{- $showfooter := not (eq 0 (int (len $footer | plainify))) }}
+        {{- $showfooter := not (eq 0 (int (len ($footer | plainify)))) }}
         {{- if or $showlangswitch $showvisitedlinks $showfooter }}
         <hr class="default-animation"/>
         {{- end }}