diff --git a/src/Elastic.ApiExplorer/Endpoints/EndpointView.cshtml b/src/Elastic.ApiExplorer/Endpoints/EndpointView.cshtml
index b8487e1fb..95bc519ec 100644
--- a/src/Elastic.ApiExplorer/Endpoints/EndpointView.cshtml
+++ b/src/Elastic.ApiExplorer/Endpoints/EndpointView.cshtml
@@ -12,8 +12,6 @@
 		Next = null,
 		NavigationHtml = Model.NavigationHtml,
 		UrlPathPrefix = null,
-		VersionDropdown = null,
-		CurrentVersion = null,
 		AllowIndexing = false,
 		CanonicalBaseUrl = null,
 		GoogleTagManager = new GoogleTagManagerConfiguration(),
diff --git a/src/Elastic.ApiExplorer/Landing/LandingView.cshtml b/src/Elastic.ApiExplorer/Landing/LandingView.cshtml
index f6af0e1d7..d24553791 100644
--- a/src/Elastic.ApiExplorer/Landing/LandingView.cshtml
+++ b/src/Elastic.ApiExplorer/Landing/LandingView.cshtml
@@ -12,8 +12,6 @@
 		Next = null,
 		NavigationHtml = Model.NavigationHtml,
 		UrlPathPrefix = null,
-		VersionDropdown = null,
-		CurrentVersion = "9.0+",
 		AllowIndexing = false,
 		CanonicalBaseUrl = null,
 		GoogleTagManager = new GoogleTagManagerConfiguration(),
diff --git a/src/Elastic.ApiExplorer/Operations/OperationView.cshtml b/src/Elastic.ApiExplorer/Operations/OperationView.cshtml
index bf2593d1c..12d821176 100644
--- a/src/Elastic.ApiExplorer/Operations/OperationView.cshtml
+++ b/src/Elastic.ApiExplorer/Operations/OperationView.cshtml
@@ -12,8 +12,6 @@
 		Next = null,
 		NavigationHtml = Model.NavigationHtml,
 		UrlPathPrefix = null,
-		VersionDropdown = null,
-		CurrentVersion = null,
 		AllowIndexing = false,
 		CanonicalBaseUrl = null,
 		GoogleTagManager = new GoogleTagManagerConfiguration(),
diff --git a/src/Elastic.Documentation.Site/Assets/web-components/VersionDropdown.tsx b/src/Elastic.Documentation.Site/Assets/web-components/VersionDropdown.tsx
index bc5b17576..c4d77844a 100644
--- a/src/Elastic.Documentation.Site/Assets/web-components/VersionDropdown.tsx
+++ b/src/Elastic.Documentation.Site/Assets/web-components/VersionDropdown.tsx
@@ -1,3 +1,5 @@
+'strict'
+
 import {
     EuiButton,
     EuiContextMenu,
@@ -6,7 +8,12 @@ import {
     EuiIcon,
     EuiPopover,
     EuiText,
+    EuiPanel,
+    EuiLink,
+    useEuiOverflowScroll,
     useGeneratedHtmlId,
+    useEuiTheme,
+    useEuiFontSize,
 } from '@elastic/eui'
 import { icon as EuiIconVisualizeApp } from '@elastic/eui/es/components/icon/assets/app_visualize'
 import { icon as EuiIconArrowDown } from '@elastic/eui/es/components/icon/assets/arrow_down'
@@ -50,12 +57,18 @@ type VersionDropdownItem = {
 }
 
 type VersionDropdownProps = {
-    currentVersion: string
-    items: VersionDropdownItem[]
+    currentVersion?: string
+    allVersionsUrl?: string
+    items?: VersionDropdownItem[]
 }
 
-const VersionDropdown = ({ currentVersion, items }: VersionDropdownProps) => {
+const VersionDropdown = ({
+    allVersionsUrl,
+    currentVersion,
+    items,
+}: VersionDropdownProps) => {
     const [isPopoverOpen, setPopover] = useState(false)
+    const { euiTheme } = useEuiTheme()
 
     const contextMenuPopoverId = useGeneratedHtmlId({
         prefix: 'contextMenuPopover',
@@ -84,60 +97,112 @@ const VersionDropdown = ({ currentVersion, items }: VersionDropdownProps) => {
     const convertToPanels = (
         items: VersionDropdownItem[]
     ): EuiContextMenuPanelDescriptor[] => {
-        return items.flatMap((item, index) => {
-            if (item.children == null) {
-                return []
-            } else {
-                return {
-                    id: index + 1,
-                    title: item.name,
-                    initialFocusedItemIndex: 0,
-                    width: WIDTH,
-                    disabled: item.disabled,
-                    size: 's',
-                    items: item.children ? convertItems(item.children) : [],
-                }
-            }
-        })
+        return items == null
+            ? []
+            : items.flatMap((item, index) => {
+                  if (item.children == null) {
+                      return []
+                  } else {
+                      return {
+                          id: index + 1,
+                          title: item.name,
+                          initialFocusedItemIndex: 0,
+                          width: WIDTH,
+                          disabled: item.disabled,
+                          size: 's',
+                          items: item.children
+                              ? convertItems(item.children)
+                              : [],
+                      }
+                  }
+              })
     }
 
     const WIDTH = 175
 
-    const topLevelItems = items.map((item, index) => {
-        return {
-            name: item.name,
-            panel: item.children?.length ? index + 1 : undefined,
-            href: item.href,
-            disabled: item.disabled,
-        }
-    })
+    const topLevelItems = () =>
+        items.map((item, index) => {
+            return {
+                name: item.name,
+                panel: item.children?.length ? index + 1 : undefined,
+                href: item.href,
+                disabled: item.disabled,
+            }
+        })
 
-    const subpanels = convertToPanels(items)
+    const subpanels = () => convertToPanels(items)
 
-    const panels: EuiContextMenuPanelDescriptor[] = [
+    const panels = (): EuiContextMenuPanelDescriptor[] => [
         {
             id: 0,
             title: (
                 <EuiFlexGroup gutterSize="s" alignItems="center">
                     <EuiFlexItem grow={0}>
-                        <EuiIcon type="check" />
+                        <EuiIcon type="check" size="s" />
                     </EuiFlexItem>
                     <EuiFlexItem grow={1}>
-                        Current ({currentVersion})
+                        <EuiText size="s">{currentVersion}</EuiText>
                     </EuiFlexItem>
                 </EuiFlexGroup>
             ),
             width: WIDTH,
             size: 's',
             items: [
-                ...topLevelItems,
-                {
-                    name: 'All versions',
-                    href: 'https://elastic.co',
-                },
+                ...(items == null
+                    ? [
+                          {
+                              renderItem: () => (
+                                  <EuiPanel paddingSize="s" hasShadow={false}>
+                                      <EuiText size="xs" color="subdued">
+                                          There are no other versions available
+                                          for this page.
+                                      </EuiText>
+                                  </EuiPanel>
+                              ),
+                          },
+                      ]
+                    : topLevelItems()),
+                ...(items?.length === 0
+                    ? [
+                          {
+                              renderItem: () => (
+                                  <EuiPanel paddingSize="s" hasShadow={false}>
+                                      <EuiText size="xs" color="subdued">
+                                          This page was fully migrated to the
+                                          current version.
+                                      </EuiText>
+                                  </EuiPanel>
+                              ),
+                          },
+                      ]
+                    : []),
+                ...(allVersionsUrl != null
+                    ? [
+                          {
+                              renderItem: () => (
+                                  <EuiPanel
+                                      css={css`
+                                          border-top: 1px solid
+                                              ${euiTheme.border.color};
+                                          padding: ${euiTheme.size.s};
+                                      `}
+                                  >
+                                      <EuiLink
+                                          href="/docs/versions"
+                                          color="text"
+                                      >
+                                          <EuiText size="s">
+                                              View all versions
+                                          </EuiText>
+                                      </EuiLink>
+                                  </EuiPanel>
+                              ),
+                          },
+                      ]
+                    : []),
             ],
         },
-        ...subpanels,
+        ...(items != null ? subpanels() : []),
     ]
 
     const button = (
@@ -150,13 +215,12 @@ const VersionDropdown = ({ currentVersion, items }: VersionDropdownProps) => {
             style={{ borderRadius: 9999 }}
         >
             <EuiText
-                size="xs"
                 css={css`
-                    font-weight: 600;
-                    font-size: 0.875rem;
+                    font-weight: ${euiTheme.font.weight.bold};
+                    font-size: ${useEuiFontSize('xs').fontSize};
                 `}
             >
-                Current ({currentVersion})
+                Current version ({currentVersion})
             </EuiText>
         </EuiButton>
     )
@@ -168,10 +232,35 @@ const VersionDropdown = ({ currentVersion, items }: VersionDropdownProps) => {
             isOpen={isPopoverOpen}
             closePopover={closePopover}
             panelPaddingSize="none"
-            anchorPosition="downLeft"
+            anchorPosition="downRight"
             repositionOnScroll={true}
         >
-            <EuiContextMenu initialPanelId={0} size="s" panels={panels} />
+            <EuiContextMenu
+                initialPanelId={0}
+                size="s"
+                panels={panels()}
+                css={css`
+                    max-height: 70vh;
+                    // This is needed because the CSS reset we are using
+                    // is probably not fully compatible with the EUI
+                    button {
+                        cursor: pointer;
+                        &:disabled {
+                            cursor: default;
+                        }
+                    }
+                    .euiContextMenuPanel__title {
+                        position: sticky;
+                        top: 0;
+                        // !important because clicking on the title
+                        // makes the background transparent
+                        // and you unexpectedly see the items behind it.
+                        background-color: ${euiTheme.colors
+                            .backgroundBasePlain} !important;
+                    }
+                    ${useEuiOverflowScroll('y')}
+                `}
+            />
         </EuiPopover>
     )
 }
@@ -182,6 +271,7 @@ customElements.define(
         props: {
             items: 'json',
             currentVersion: 'string',
+            allVersionsUrl: 'string',
         },
     })
 )
diff --git a/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml b/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
index 528317811..f4bd99a58 100644
--- a/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
+++ b/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
@@ -13,13 +13,6 @@
 				</label>
 			}
 			<a href="@Model.Link("/")" class="text-lg leading-[1em] hover:text-blue-elastic active:text-blue-elastic-100">Docs</a>
-			
-			@if (Model.Features.IsVersionDropdownEnabled && Model.VersionDropdown is not null)
-			{
-				<div id="version-dropdown">
-					<version-dropdown current-version='@(Model.CurrentVersion)' items='@(new HtmlString(Model.VersionDropdown))' />
-				</div>
-			}
 		</div>
 		<ul class="flex gap-6">
 			<li class="text-nowrap hover:text-blue-elastic active:text-blue-elastic-100">
diff --git a/src/Elastic.Documentation.Site/_ViewModels.cs b/src/Elastic.Documentation.Site/_ViewModels.cs
index 0a7250d90..20d7521af 100644
--- a/src/Elastic.Documentation.Site/_ViewModels.cs
+++ b/src/Elastic.Documentation.Site/_ViewModels.cs
@@ -25,9 +25,6 @@ public class GlobalLayoutViewModel
 	public required INavigationItem? Previous { get; init; }
 	public required INavigationItem? Next { get; init; }
 
-	public required string? VersionDropdown { get; init; }
-	public required string? CurrentVersion { get; init; }
-
 	public required string NavigationHtml { get; init; }
 	public required string? UrlPathPrefix { get; init; }
 	public required Uri? CanonicalBaseUrl { get; init; }
diff --git a/src/Elastic.Markdown/Slices/HtmlWriter.cs b/src/Elastic.Markdown/Slices/HtmlWriter.cs
index c3b02c3b5..6beb147da 100644
--- a/src/Elastic.Markdown/Slices/HtmlWriter.cs
+++ b/src/Elastic.Markdown/Slices/HtmlWriter.cs
@@ -85,6 +85,11 @@ private async Task<string> RenderLayout(MarkdownFile markdown, MarkdownDocument
 			.Distinct()
 			.ToHashSet();
 
+		string? allVersionsUrl = null;
+
+		if (PositionalNavigation.MarkdownNavigationLookup.TryGetValue("docs-content://versions.md", out var item))
+			allVersionsUrl = item.Url;
+
 		var slice = Index.Create(new IndexViewModel
 		{
 			SiteName = siteName,
@@ -111,6 +116,7 @@ private async Task<string> RenderLayout(MarkdownFile markdown, MarkdownDocument
 			StaticFileContentHashProvider = StaticFileContentHashProvider,
 			ReportIssueUrl = reportUrl,
 			CurrentVersion = legacyPages?.Count > 0 ? legacyPages.ElementAt(0).Version : "9.0+",
+			AllVersionsUrl = allVersionsUrl,
 			LegacyPages = legacyPages?.Skip(1).ToArray(),
 			VersionDropdownItems = VersionDrownDownItemViewModel.FromLegacyPageMappings(legacyPages?.Skip(1).ToArray()),
 			Products = allProducts
diff --git a/src/Elastic.Markdown/Slices/Index.cshtml b/src/Elastic.Markdown/Slices/Index.cshtml
index ddf03ef17..18c53c873 100644
--- a/src/Elastic.Markdown/Slices/Index.cshtml
+++ b/src/Elastic.Markdown/Slices/Index.cshtml
@@ -31,7 +31,8 @@
 		ReportIssueUrl = Model.ReportIssueUrl,
 		LegacyPages = Model.LegacyPages,
 		CurrentVersion = Model.CurrentVersion,
-		VersionDropdown = JsonSerializer.Serialize(Model.VersionDropdownItems,
+		AllVersionsUrl = Model.AllVersionsUrl,
+		VersionDropdownSerializedModel = JsonSerializer.Serialize(Model.VersionDropdownItems,
 			ViewModelSerializerContext.Default.VersionDrownDownItemViewModelArray),
 	};
 	protected override Task ExecuteSectionAsync(string name)
diff --git a/src/Elastic.Markdown/Slices/IndexViewModel.cs b/src/Elastic.Markdown/Slices/IndexViewModel.cs
index 77bcf9f45..066ba4835 100644
--- a/src/Elastic.Markdown/Slices/IndexViewModel.cs
+++ b/src/Elastic.Markdown/Slices/IndexViewModel.cs
@@ -34,6 +34,8 @@ public class IndexViewModel
 
 	public required string NavigationHtml { get; init; }
 	public required string CurrentVersion { get; init; }
+
+	public required string? AllVersionsUrl { get; init; }
 	public required LegacyPageMapping[]? LegacyPages { get; init; }
 	public required VersionDrownDownItemViewModel[]? VersionDropdownItems { get; init; }
 	public required string? UrlPathPrefix { get; init; }
diff --git a/src/Elastic.Markdown/Slices/Layout/_LandingPage.cshtml b/src/Elastic.Markdown/Slices/Layout/_LandingPage.cshtml
index aa9e65d88..a74d73262 100644
--- a/src/Elastic.Markdown/Slices/Layout/_LandingPage.cshtml
+++ b/src/Elastic.Markdown/Slices/Layout/_LandingPage.cshtml
@@ -19,6 +19,18 @@
 						Upgrade versions
 					</a>
 				</div>
+				@if (Model.AllVersionsUrl is not null)
+				{
+					<div class="mt-6">
+						<a href="@Model.AllVersionsUrl" class="link">
+							View previous docs versions
+							<svg class="link-arrow"
+							     xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
+								<path stroke-linecap="round" stroke-linejoin="round" d="M17.25 8.25 21 12m0 0-3.75 3.75M21 12H3"/>
+							</svg>
+						</a>
+					</div>
+				}
 			</div>
 			<div class="flex justify-center items-center">
 				<img src="@Model.Static("web-documentation-hero-illustration.svg")" alt="" width="400">
diff --git a/src/Elastic.Markdown/Slices/Layout/_TableOfContents.cshtml b/src/Elastic.Markdown/Slices/Layout/_TableOfContents.cshtml
index 649641a72..ff16bdcd2 100644
--- a/src/Elastic.Markdown/Slices/Layout/_TableOfContents.cshtml
+++ b/src/Elastic.Markdown/Slices/Layout/_TableOfContents.cshtml
@@ -1,7 +1,15 @@
 @inherits RazorSlice<MarkdownLayoutViewModel>
 <aside class="sidebar hidden lg:block max-w-65 md:hidden">
 	<nav id="toc-nav" class="sidebar-nav h-full">
-		<div id="page-version-dropdown" tabindex="1"
+		@if (Model.Features.IsVersionDropdownEnabled)
+		{
+			<div class="mt-6">
+				<version-dropdown all-versions-url="@Model.AllVersionsUrl" current-version='@(Model.CurrentVersion)' items='@(new HtmlString(Model.VersionDropdownSerializedModel))' />
+			</div>
+		}
+		else
+		{
+			<div id="page-version-dropdown" tabindex="1"
 		     class="mt-6 block group font-sans text-sm relative z-50">
 			<button
 				class="text-left border-1 rounded-2xl grid grid-cols-[1fr_auto] cursor-pointer font-semibold gap-1 hover:text-black pl-4 pr-1 py-1 group-open:border-b-1 border-grey-20">
@@ -65,7 +73,7 @@
 									@legacyPage.Version
 								</a>
 							}
-							
+
 						</li>
 					}
 					@if (Model.LegacyPages is null) // This means there is no mapping because the page is new in v3
@@ -75,7 +83,8 @@
 								There is no previous version of this page.
 							</div>
 						</li>
-					} else if (Model.LegacyPages.Length == 0) // This means there is a legacy page mapping with 0 entries, which means the page was fully migrated and is also redirecting to the new system.
+					}
+					else if (Model.LegacyPages.Length == 0) // This means there is a legacy page mapping with 0 entries, which means the page was fully migrated and is also redirecting to the new system.
 					{
 						<li class="block border-t-1 border-grey-20">
 							<div class="py-1 px-4 text-sm">
@@ -86,6 +95,7 @@
 				</ul>
 			</div>
 		</div>
+		}
 		<ul class="mt-6">
 
 			@if (Model.GithubEditUrl is not null)
diff --git a/src/Elastic.Markdown/Slices/MarkdownLayoutViewModel.cs b/src/Elastic.Markdown/Slices/MarkdownLayoutViewModel.cs
index 9fa71f785..493f73f83 100644
--- a/src/Elastic.Markdown/Slices/MarkdownLayoutViewModel.cs
+++ b/src/Elastic.Markdown/Slices/MarkdownLayoutViewModel.cs
@@ -21,6 +21,12 @@ public class MarkdownLayoutViewModel : GlobalLayoutViewModel
 	public required IReadOnlyCollection<PageTocItem> PageTocItems { get; init; }
 
 	public required LayoutName? Layout { get; init; }
+
+	public required string? VersionDropdownSerializedModel { get; init; }
+
+	public required string? CurrentVersion { get; init; }
+
+	public required string? AllVersionsUrl { get; init; }
 }
 
 public record PageTocItem