diff --git a/projects/js-packages/components/changelog/fix-admin-page-header-height-admin-ui-2-1 b/projects/js-packages/components/changelog/fix-admin-page-header-height-admin-ui-2-1
new file mode 100644
index 000000000000..079f21668eb9
--- /dev/null
+++ b/projects/js-packages/components/changelog/fix-admin-page-header-height-admin-ui-2-1
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+AdminPage: fix header-height tab-shift rule not matching after admin-ui 2.1 changed the page header element from header to div
diff --git a/projects/js-packages/components/components/admin-page/style.module.scss b/projects/js-packages/components/components/admin-page/style.module.scss
index 546f4d388ec7..e94eb9d9b81d 100644
--- a/projects/js-packages/components/components/admin-page/style.module.scss
+++ b/projects/js-packages/components/components/admin-page/style.module.scss
@@ -52,7 +52,9 @@
 	// row's items so a shorter control neither stretches nor collapses it.
 	// The content row is identified by the visual logo slot it contains
 	// (`aria-hidden="true"`), so a breadcrumbs-only header isn't affected.
-	:global(.jp-admin-page__page > header > div:has([aria-hidden="true"])) {
+	// `> :first-child` targets the page header positionally (a `<div>` in
+	// admin-ui ≥ 2.1, a `<header>` in 2.0) — matching the sibling rules above.
+	:global(.jp-admin-page__page > :first-child > div:has([aria-hidden="true"])) {
 		min-height: 40px;
 		align-items: center;
 	}