diff --git a/docs/themes/docs-theme/layouts/partials/docs/glossary-terms.html b/docs/themes/docs-theme/layouts/partials/docs/glossary-terms.html
index efd91a40b9..cb2eabf004 100644
--- a/docs/themes/docs-theme/layouts/partials/docs/glossary-terms.html
+++ b/docs/themes/docs-theme/layouts/partials/docs/glossary-terms.html
@@ -1,4 +1,4 @@
-{{ $glossaryBundle := site.GetPage "page" "glossary" }}
+{{ $glossaryBundle := site.GetPage "page" "docs/glossary" }}
 {{- if $glossaryBundle -}}
   {{ $pages := $glossaryBundle.Resources.ByType "page" }}
   {{- range site.Params.language_alternatives -}}
diff --git a/docs/themes/docs-theme/layouts/shortcodes/glossary_tooltip.html b/docs/themes/docs-theme/layouts/shortcodes/glossary_tooltip.html
index cefbebcac3..3fa76d1e30 100644
--- a/docs/themes/docs-theme/layouts/shortcodes/glossary_tooltip.html
+++ b/docs/themes/docs-theme/layouts/shortcodes/glossary_tooltip.html
@@ -11,7 +11,7 @@
 {{- end }}
 {{- with $term_info -}}
 {{- $text := $text | default $term_info.Title -}}
-{{- $glossary_home := "reference/glossary/?all=true" | relLangURL -}}
+{{- $glossary_home := "glossary/?all=true" | relLangURL -}}
 {{- $external_link := $term_info.Params.full_link | default (printf "%s#term-%s" $glossary_home $id | safeURL  ) -}}
 {{- $tooltip :=  $term_info.Params.short_description | markdownify -}}
 {{- $tooltip := $tooltip | replaceRE "(?s)<a class='glossary-tooltip'.*?>(.*?)<span class='tooltip-text'>.*</a>" "$1" | plainify -}}