diff --git a/.changeset/flat-crews-beam.md b/.changeset/flat-crews-beam.md
new file mode 100644
index 00000000..c3f1715b
--- /dev/null
+++ b/.changeset/flat-crews-beam.md
@@ -0,0 +1,5 @@
+---
+'@microsoft/atlas-js': minor
+---
+
+Atlas layout JS should also set the visible height of the header and the visible height of the footer.
diff --git a/.changeset/rich-lions-add.md b/.changeset/rich-lions-add.md
new file mode 100644
index 00000000..add9f0e0
--- /dev/null
+++ b/.changeset/rich-lions-add.md
@@ -0,0 +1,5 @@
+---
+'@microsoft/atlas-css': patch
+---
+
+Remove two pixel adjustment from layout-constrained-height's declaration.
diff --git a/css/src/components/layout.scss b/css/src/components/layout.scss
index c473aff5..1fbda949 100644
--- a/css/src/components/layout.scss
+++ b/css/src/components/layout.scss
@@ -363,9 +363,9 @@ $default-flyout-width-widescreen: 480px;
 		&.layout-twin,
 		&.layout-sidecar-left,
 		&.layout-sidecar-right {
-			// 👇 minus two pixel at the end to account for percentage points and rounding, one px generally suffices though
+			// 👇 minus a pixel at the end to account for percentage points and rounding
 			--atlas-contained-height: calc(
-				var(--window-inner-height) - var(--atlas-header-height) - var(--atlas-footer-height) - 2px
+				var(--window-inner-height) - var(--atlas-header-height) - var(--atlas-footer-height) - 1px
 			);
 		}
 
@@ -389,9 +389,9 @@ $default-flyout-width-widescreen: 480px;
 // Because the holy grail has two rows (containing menu main, menu aside) on tablet, we cannot apply height constraints at that size
 @include desktop {
 	.layout.layout-constrained.layout-holy-grail {
-		// 👇 minus two pixel at the end to account for percentage points and rounding, one px generally suffices though
+		// 👇 minus a pixel at the end to account for percentage points and rounding
 		--atlas-contained-height: calc(
-			var(--window-inner-height) - var(--atlas-header-height) - var(--atlas-footer-height) - 2px
+			var(--window-inner-height) - var(--atlas-header-height) - var(--atlas-footer-height) - 1px
 		);
 
 		.layout-body-main,
diff --git a/js/src/behaviors/layout.ts b/js/src/behaviors/layout.ts
index ba4e2a21..5f193849 100644
--- a/js/src/behaviors/layout.ts
+++ b/js/src/behaviors/layout.ts
@@ -3,15 +3,25 @@ let frame: number;
 const root = document.documentElement;
 
 const setLayoutCssVariables = () => {
-	const headerHeight = document.querySelector('.layout-body-header')?.clientHeight;
+	const header = document.querySelector('.layout-body-header');
+	const headerHeight = header?.clientHeight || 0;
 	const headerCssProp = headerHeight ? `${headerHeight}px` : '0px';
+	const headerY = header?.getBoundingClientRect().y || 0; // determine if header is visible, assign visible heights as well
+	const visibleHeaderHeight = Math.round(Math.max(0, headerY + headerHeight));
+	const visibleHeaderCssProp = `${visibleHeaderHeight}px`;
 
-	const footerHeight = document.querySelector('.layout-body-footer')?.clientHeight;
+	const footer = document.querySelector('.layout-body-footer');
+	const footerHeight = footer?.clientHeight || 0;
 	const footerCssProp = footerHeight ? `${footerHeight}px` : '0px';
+	const footerY = footer?.getBoundingClientRect().y || 0; // determine if header and footer are visible, assign visible heights as well
+	const visibleFooterHeight = Math.round(Math.max(0, footerY + footerHeight));
+	const visibleFooterCssProp = `${visibleFooterHeight}px`;
 
 	root.style.setProperty('--window-inner-height', `${window.innerHeight}px`, 'important');
 	root.style.setProperty('--atlas-header-height', headerCssProp, 'important');
 	root.style.setProperty('--atlas-footer-height', footerCssProp, 'important');
+	root.style.setProperty('--atlas-header-visible-height', visibleHeaderCssProp, 'important');
+	root.style.setProperty('--atlas-footer-visible-height', visibleFooterCssProp, 'important');
 };
 
 export function initLayout() {
@@ -23,11 +33,13 @@ export function initLayout() {
 		frame = requestAnimationFrame(setLayoutCssVariables);
 	});
 
-	window.addEventListener('resize', () =>
-		window.dispatchEvent(new CustomEvent('atlas-layout-change-event'))
+	window.addEventListener(
+		'resize',
+		() => window.dispatchEvent(new CustomEvent('atlas-layout-change-event')),
+		{ passive: true }
 	);
 
 	root.style.setProperty('--window-inner-height', `${window.innerHeight}px`);
 
-	window.addEventListener('DOMContentLoaded', setLayoutCssVariables);
+	window.addEventListener('DOMContentLoaded', setLayoutCssVariables, { passive: true });
 }