diff --git a/src/Elastic.Markdown/Myst/Renderers/HtmxLinkInlineRenderer.cs b/src/Elastic.Markdown/Myst/Renderers/HtmxLinkInlineRenderer.cs
index eff23f13c..c7dbede0c 100644
--- a/src/Elastic.Markdown/Myst/Renderers/HtmxLinkInlineRenderer.cs
+++ b/src/Elastic.Markdown/Myst/Renderers/HtmxLinkInlineRenderer.cs
@@ -37,7 +37,7 @@ protected override void Write(HtmlRenderer renderer, LinkInline link)
 			_ = renderer.Write('"');
 			_ = renderer.WriteAttributes(link);
 
-			if (link.Url?.StartsWith('/') == true)
+			if (link.Url?.StartsWith('/') == true || isCrossLink)
 			{
 				var currentRootNavigation = link.GetData(nameof(MarkdownFile.NavigationRoot)) as INodeNavigationItem<INavigationModel, INavigationItem>;
 				var targetRootNavigation = link.GetData($"Target{nameof(MarkdownFile.NavigationRoot)}") as INodeNavigationItem<INavigationModel, INavigationItem>;
diff --git a/src/Elastic.Markdown/Myst/Renderers/WrappedTableRenderer.cs b/src/Elastic.Markdown/Myst/Renderers/WrappedTableRenderer.cs
index 466d6a187..09d0181ca 100644
--- a/src/Elastic.Markdown/Myst/Renderers/WrappedTableRenderer.cs
+++ b/src/Elastic.Markdown/Myst/Renderers/WrappedTableRenderer.cs
@@ -12,7 +12,7 @@ public class WrappedTableRenderer : HtmlTableRenderer
 	protected override void Write(HtmlRenderer renderer, Table table)
 	{
 		// Wrap the table in a div to allow for overflow scrolling
-		_ = renderer.Write("<div class=\"table-wrapper\" hx-disable=\"true\">");
+		_ = renderer.Write("<div class=\"table-wrapper\">");
 		base.Write(renderer, table);
 		_ = renderer.Write("</div>");
 	}
diff --git a/tests/Elastic.Markdown.Tests/Inline/InlineLinkTests.cs b/tests/Elastic.Markdown.Tests/Inline/InlineLinkTests.cs
index c4049422c..a7644bf99 100644
--- a/tests/Elastic.Markdown.Tests/Inline/InlineLinkTests.cs
+++ b/tests/Elastic.Markdown.Tests/Inline/InlineLinkTests.cs
@@ -150,7 +150,7 @@ Go to [test](kibana://index.md)
 	public void GeneratesHtml() =>
 		// language=html
 		Html.Should().Contain(
-			"""<p>Go to <a href="https://docs-v3-preview.elastic.dev/elastic/kibana/tree/main/">test</a></p>"""
+			"""<p>Go to <a href="https://docs-v3-preview.elastic.dev/elastic/kibana/tree/main/" hx-select-oob="#main-container" preload="mousedown">test</a></p>"""
 		);
 
 	[Fact]