diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 4e37123293..579a8af6e1 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -52,7 +52,7 @@
           {{- $showBreadcrumb := (and (not .Params.disableBreadcrumb) (not .Site.Params.disableBreadcrumb)) }}
           {{- if $showBreadcrumb }}
           <ol class="topbar-breadcrumbs breadcrumbs highlightable" itemscope itemtype="http://schema.org/BreadcrumbList">
-            {{- partial "breadcrumbs.html" (dict "page" .) }}
+            {{- partial "breadcrumbs.html" (dict "page" . "schema" true) }}
           </ol>
           {{- else }}
           <span class="topbar-breadcrumbs highlightable">
diff --git a/layouts/partials/breadcrumbs.html b/layouts/partials/breadcrumbs.html
index 78a88a6f3e..788f6c2a70 100644
--- a/layouts/partials/breadcrumbs.html
+++ b/layouts/partials/breadcrumbs.html
@@ -8,9 +8,6 @@
   {{- $lasturl = partial "permalink.gotmpl" (dict "to" $page) }}
 {{- end }}
 {{- $depth := add 1 (int (partial "_relearn/pageDepth.gotmpl" (dict "page" $page))) }}
-{{- if .page.Site.Params.disableRootBreadcrumb }}
-  {{- $depth = add $depth -1 }}
-{{- end }}
 {{- $breadcrumb := slice }}
 {{- range seq $depth }}
   {{- if $to }}
@@ -33,11 +30,16 @@
 {{- range $i, $e := $breadcrumbReversed }}
   {{- $to := $e }}
   {{- $depth = add $depth 1 }}
+  {{- $class := "" }}
+  {{- if and (eq $depth 1) site.Params.disableRootBreadcrumb }}
+    {{- $class = "a11y-only" }}
+  {{- end }}
   {{- $title := partial "title.gotmpl" (dict "page" $to "linkTitle" true) }}
   {{- $url := partial "permalink.gotmpl" (dict "to" $to) }}
   {{- $isPage := eq $url $pageurl }}
   {{- $isLast := eq $url $lasturl }}
   {{- $link := and $url (not $isPage) }}
-  {{- printf "<li" | safeHTML }}
-            itemscope itemtype="https://schema.org/ListItem" itemprop="itemListElement">{{ if $link }}<a itemprop="item" href="{{ $url }}">{{end}}<span itemprop="name">{{ $title }}</span>{{ if $link }}</a>{{ end }}<meta itemprop="position" content="{{ $depth }}">{{ if not $isLast }}{{ (printf "&nbsp;%s&nbsp;" (default ">" .Site.Params.breadcrumbSeparator)) | safeHTML }}{{ end }}</li>
+  {{- if or $.schema (not $class) }}
+            <li{{ if $.schema }} itemscope itemtype="https://schema.org/ListItem" itemprop="itemListElement"{{ end }} class="{{ $class | safeHTMLAttr }}">{{ if $link }}<a{{ if $.schema }} itemprop="item"{{ end }} href="{{ $url }}">{{end}}<span{{ if $.schema }} itemprop="name"{{ end }}>{{ $title }}</span>{{ if $link }}</a>{{ end }}{{ if $.schema }}<meta itemprop="position" content="{{ $depth }}">{{ end }}{{ if not $isLast }}{{ (printf "&nbsp;%s&nbsp;" (default ">" .Site.Params.breadcrumbSeparator)) | safeHTML }}{{ end }}</li>
+  {{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/layouts/partials/version.txt b/layouts/partials/version.txt
index 7799b2b9d2..44b00a1cba 100644
--- a/layouts/partials/version.txt
+++ b/layouts/partials/version.txt
@@ -1 +1 @@
-7.3.2+52fcb55f86db03a6d41139167165505e62cf5364
\ No newline at end of file
+7.3.2+de59e6700a230cecc75cebb1b225fe189f0189e7
\ No newline at end of file