diff --git a/ILSpy.Tests/Metadata/MetadataTokenNavigationTests.cs b/ILSpy.Tests/Metadata/MetadataTokenNavigationTests.cs
index 89641d4c0..f8c5590b1 100644
--- a/ILSpy.Tests/Metadata/MetadataTokenNavigationTests.cs
+++ b/ILSpy.Tests/Metadata/MetadataTokenNavigationTests.cs
@@ -75,7 +75,7 @@ public class MetadataTokenNavigationTests
 		// and a fresh metadata page is showing.
 		var factory = (global::ILSpy.Docking.ILSpyDockFactory)vm.DockWorkspace.Factory;
 		var landed = (MetadataTablePageModel)factory.MainTab!.Content!;
-		landed.Title.Should().StartWith(expectedTableIndex.ToString());
+		landed.Title.Should().Contain(expectedTableIndex.ToString()); // title leads with the kind byte
 		landed.Items.Should().HaveCountGreaterThan((int)(expectedRowNumber - 1),
 			"the target row index must be in range for the destination table");
 	}
diff --git a/ILSpy.Tests/Metadata/TypedMetadataTableTreeTests.cs b/ILSpy.Tests/Metadata/TypedMetadataTableTreeTests.cs
index 3a95b9961..c5d4ecdda 100644
--- a/ILSpy.Tests/Metadata/TypedMetadataTableTreeTests.cs
+++ b/ILSpy.Tests/Metadata/TypedMetadataTableTreeTests.cs
@@ -57,7 +57,7 @@ public class TypedMetadataTableTreeTests
 		var tab = await vm.DockWorkspace.WaitForMetadataTabAsync();
 		TestCapture.Step("assemblyref-grid");
 
-		tab.Title.Should().StartWith("AssemblyRef");
+		tab.Title.Should().Contain("AssemblyRef"); // title now leads with the token-kind byte
 		tab.Items.Should().HaveCount(assemblyRefNode.RowCount);
 		var names = tab.Items.Cast<AssemblyRefTableTreeNode.AssemblyRefEntry>()
 			.Select(e => e.Name)
@@ -82,7 +82,7 @@ public class TypedMetadataTableTreeTests
 		var tab = await vm.DockWorkspace.WaitForMetadataTabAsync();
 		TestCapture.Step("typedef-grid");
 
-		tab.Title.Should().StartWith("TypeDef");
+		tab.Title.Should().Contain("TypeDef"); // title now leads with the token-kind byte
 		tab.Items.Cast<TypeDefTableTreeNode.TypeDefEntry>()
 			.Should().Contain(e => e.Name == "Object");
 	}
@@ -112,7 +112,7 @@ public class TypedMetadataTableTreeTests
 		vm.AssemblyTreeModel.SelectNode(methodNode);
 		var tab = await vm.DockWorkspace.WaitForMetadataTabAsync();
 		TestCapture.Step("methoddef-grid");
-		tab.Title.Should().StartWith("MethodDef");
+		tab.Title.Should().Contain("MethodDef"); // title now leads with the token-kind byte
 		tab.Columns.Select(c => c.Tag).Should().Contain("RID");
 	}
 
@@ -132,7 +132,7 @@ public class TypedMetadataTableTreeTests
 		var tab = await vm.DockWorkspace.WaitForMetadataTabAsync();
 		TestCapture.Step("module-grid");
 
-		tab.Title.Should().StartWith("Module");
+		tab.Title.Should().Contain("Module"); // title now leads with the token-kind byte
 		tab.Items.Should().HaveCount(1);
 		var row = (ModuleTableTreeNode.ModuleEntry)tab.Items[0];
 		row.Name.Should().EndWith(".dll");
diff --git a/ILSpy/Metadata/MetadataTableTreeNode.cs b/ILSpy/Metadata/MetadataTableTreeNode.cs
index 9f716f721..f5465b8c3 100644
--- a/ILSpy/Metadata/MetadataTableTreeNode.cs
+++ b/ILSpy/Metadata/MetadataTableTreeNode.cs
@@ -82,7 +82,9 @@ namespace ILSpy.Metadata
 			// + ReflectionHelper.GetNestedPropertyValue, which return null for every row when
 			// the source's element type is object.
 			var page = new MetadataTablePageModel {
-				Title = $"{Kind} ({RowCount})",
+				// Lead with the token-kind byte, mirroring the tree node's Text so the tab header
+				// reads e.g. "02 TypeDef (1234)".
+				Title = $"{(byte)Kind:X2} {Kind} ({RowCount})",
 				Items = cached ??= LoadTable(),
 			};
 			MetadataColumnBuilder.Populate<TEntry>(page);