diff --git a/components/page/demo/page-component.js b/components/page/demo/page-component.js
index 8dd0d2dd1bd..f166aee82ff 100644
--- a/components/page/demo/page-component.js
+++ b/components/page/demo/page-component.js
@@ -60,6 +60,7 @@ class PageDemo extends LitElement {
 		}
 		.horizontal-fields {
 			display: flex;
+			flex-wrap: wrap;
 			gap: 1rem;
 		}
 	`];
diff --git a/components/page/page-divider-internal.js b/components/page/page-divider-internal.js
index d2466c50cb0..1d28d251dab 100644
--- a/components/page/page-divider-internal.js
+++ b/components/page/page-divider-internal.js
@@ -57,16 +57,22 @@ class PageDivider extends FocusMixin(PropertyRequiredMixin(LitElement)) {
 			background-color: var(--d2l-color-gypsum);
 			cursor: ew-resize;
 			height: 100%;
-			outline: none;
+			position: relative;
 			width: ${DIVIDER_WIDTH}px;
 		}
 		.divider:hover {
 			background-color: var(--d2l-color-mica);
 		}
-		.divider:focus {
+		.divider:focus-within {
 			background-color: var(--d2l-color-celestine);
 		}
 
+		.slider {
+			outline: none;
+			position: absolute;
+			top: 55px;
+		}
+
 		:host([panel-type="drawer"]) .divider {
 			background-color: var(--d2l-color-celestine);
 			cursor: ns-resize;
@@ -74,11 +80,16 @@ class PageDivider extends FocusMixin(PropertyRequiredMixin(LitElement)) {
 			width: 100%;
 		}
 
+		:host([panel-type="drawer"]) .slider {
+			inset-inline-end: 18px;
+			top: auto;
+		}
+
 		/* TO DO: Lots more divider styling to come */
 
 	`;
 
-	static focusElementSelector = '.divider';
+	static focusElementSelector = '.slider';
 
 	constructor() {
 		super();
@@ -98,17 +109,19 @@ class PageDivider extends FocusMixin(PropertyRequiredMixin(LitElement)) {
 		}
 
 		return html`
-			<div
-				class="divider"
-				role="slider"
-				tabindex="0"
-				aria-label="${this.label}"
-				aria-orientation="${this.panelType === 'panel' ? 'horizontal' : 'vertical'}"
-				aria-valuemax="${ifDefined(ariaValues.max)}"
-				aria-valuemin="${ifDefined(ariaValues.min)}"
-				aria-valuenow="${ifDefined(ariaValues.now)}"
-				aria-valuetext="${ifDefined(ariaValues.text)}"
-				@keydown="${this.#handleKeyDown}">
+		    <div class="divider" @pointerdown="${this.#handlePointerDown}">
+				<div
+					class="slider"
+					role="slider"
+					tabindex="0"
+					aria-label="${this.label}"
+					aria-orientation="${this.panelType === 'panel' ? 'horizontal' : 'vertical'}"
+					aria-valuemax="${ifDefined(ariaValues.max)}"
+					aria-valuemin="${ifDefined(ariaValues.min)}"
+					aria-valuenow="${ifDefined(ariaValues.now)}"
+					aria-valuetext="${ifDefined(ariaValues.text)}"
+					@keydown="${this.#handleKeyDown}">
+				</div>
 			</div>
 		`;
 	}
@@ -148,6 +161,11 @@ class PageDivider extends FocusMixin(PropertyRequiredMixin(LitElement)) {
 		this.#sendResizeEvent(requestedSize);
 	}
 
+	#handlePointerDown(e) {
+		e.preventDefault();
+		this.focus();
+	}
+
 	#sendResizeEvent(requestedSize) {
 		const clampedRequestedSize = clampedSize(requestedSize, this.minSize, this.maxSize);
 		/** @ignore */
diff --git a/components/page/page.js b/components/page/page.js
index 8ad02253eec..6791db83bb1 100644
--- a/components/page/page.js
+++ b/components/page/page.js
@@ -132,13 +132,18 @@ class Page extends ProviderMixin(LocalizeCoreElement(LitElement)) {
 		}
 
 		.side-nav-panel,
-		.supporting-panel {
+		.supporting-panel,
+		.divider {
 			max-height: calc(100vh - var(--d2l-page-header-height, 0) - var(--d2l-page-footer-height, 0));
-			overflow: clip auto;
 			position: sticky;
 			top: var(--d2l-page-header-height, 0);
 		}
 
+		.side-nav-panel,
+		.supporting-panel {
+			overflow: clip auto;
+		}
+
 		.footer:not([hidden]),
 		.floating-buttons-container {
 			display: inline;
@@ -294,6 +299,7 @@ class Page extends ProviderMixin(LocalizeCoreElement(LitElement)) {
 	#renderDivider(panelKey, label, panelPosition) {
 		return html`
 			<d2l-page-divider-internal
+				class="divider"
 				data-panel-key="${panelKey}"
 				label="${label}"
 				current-size="${this._panelState.getSize(panelKey)}"
diff --git a/components/page/test/golden/page-divider-internal/chromium/focus-side-nav-long-no-scroll.png b/components/page/test/golden/page-divider-internal/chromium/focus-side-nav-long-no-scroll.png
index a4f2df69cc1..d70acb171ab 100644
Binary files a/components/page/test/golden/page-divider-internal/chromium/focus-side-nav-long-no-scroll.png and b/components/page/test/golden/page-divider-internal/chromium/focus-side-nav-long-no-scroll.png differ
diff --git a/components/page/test/golden/page-divider-internal/chromium/focus-stay-scrolled-immersive-main.png b/components/page/test/golden/page-divider-internal/chromium/focus-stay-scrolled-immersive-main.png
new file mode 100644
index 00000000000..60e70fd295b
Binary files /dev/null and b/components/page/test/golden/page-divider-internal/chromium/focus-stay-scrolled-immersive-main.png differ
diff --git a/components/page/test/golden/page-divider-internal/chromium/focus-stay-scrolled-immersive-panel.png b/components/page/test/golden/page-divider-internal/chromium/focus-stay-scrolled-immersive-panel.png
new file mode 100644
index 00000000000..800f728e098
Binary files /dev/null and b/components/page/test/golden/page-divider-internal/chromium/focus-stay-scrolled-immersive-panel.png differ
diff --git a/components/page/test/golden/page-divider-internal/chromium/focus-stay-scrolled-main.png b/components/page/test/golden/page-divider-internal/chromium/focus-stay-scrolled-main.png
new file mode 100644
index 00000000000..01a97a44b34
Binary files /dev/null and b/components/page/test/golden/page-divider-internal/chromium/focus-stay-scrolled-main.png differ
diff --git a/components/page/test/golden/page-divider-internal/chromium/focus-stay-scrolled-panel.png b/components/page/test/golden/page-divider-internal/chromium/focus-stay-scrolled-panel.png
new file mode 100644
index 00000000000..6510ee34016
Binary files /dev/null and b/components/page/test/golden/page-divider-internal/chromium/focus-stay-scrolled-panel.png differ
diff --git a/components/page/test/golden/page-divider-internal/chromium/focus-supporting-immersive-long-no-scroll.png b/components/page/test/golden/page-divider-internal/chromium/focus-supporting-immersive-long-no-scroll.png
index dc71718ef48..471f7193bb1 100644
Binary files a/components/page/test/golden/page-divider-internal/chromium/focus-supporting-immersive-long-no-scroll.png and b/components/page/test/golden/page-divider-internal/chromium/focus-supporting-immersive-long-no-scroll.png differ
diff --git a/components/page/test/golden/page-divider-internal/chromium/focus-supporting.png b/components/page/test/golden/page-divider-internal/chromium/focus-supporting.png
index debe0fbfbda..18e35ef7c3f 100644
Binary files a/components/page/test/golden/page-divider-internal/chromium/focus-supporting.png and b/components/page/test/golden/page-divider-internal/chromium/focus-supporting.png differ
diff --git a/components/page/test/page-divider-internal-fixtures.js b/components/page/test/page-divider-internal-fixtures.js
index 94d14da6fb7..c52859131f7 100644
--- a/components/page/test/page-divider-internal-fixtures.js
+++ b/components/page/test/page-divider-internal-fixtures.js
@@ -34,7 +34,7 @@ export function getDivider(elem, panelKey) {
 }
 
 export function getSlider(elem) {
-	return elem.shadowRoot.querySelector('.divider');
+	return elem.shadowRoot.querySelector('.slider');
 }
 
 export const pageDividerFixtures = {
diff --git a/components/page/test/page-divider-internal.test.js b/components/page/test/page-divider-internal.test.js
index 11327608695..d0e4a6383fc 100644
--- a/components/page/test/page-divider-internal.test.js
+++ b/components/page/test/page-divider-internal.test.js
@@ -1,6 +1,6 @@
+import { createDivider, getSlider } from './page-divider-internal-fixtures.js';
 import { expect, fixture, html, nextFrame, oneEvent, runConstructor, sendKeysElem } from '@brightspace-ui/testing';
 import { KEYBOARD_STEP, KEYBOARD_STEP_LARGE } from '../page-divider-internal.js';
-import { createDivider } from './page-divider-internal-fixtures.js';
 
 describe('d2l-page-divider-internal', () => {
 
@@ -11,7 +11,7 @@ describe('d2l-page-divider-internal', () => {
 	describe('accessibility', () => {
 		it('calculates aria values correctly', async() => {
 			const elem = await fixture(html`<d2l-page-divider-internal label="Resize" min-size="100" max-size="200" current-size="150"></d2l-page-divider-internal>`);
-			const slider = elem.shadowRoot.querySelector('.divider');
+			const slider = getSlider(elem);
 			expect(slider.getAttribute('aria-valuemax')).to.equal('200');
 			expect(slider.getAttribute('aria-valuemin')).to.equal('0');
 			expect(slider.getAttribute('aria-valuenow')).to.equal('150');
@@ -20,7 +20,7 @@ describe('d2l-page-divider-internal', () => {
 
 		it('does not set aria values when in unknown state', async() => {
 			const elem = await fixture(html`<d2l-page-divider-internal label="Resize"></d2l-page-divider-internal>`);
-			const slider = elem.shadowRoot.querySelector('.divider');
+			const slider = getSlider(elem);
 			expect(slider.hasAttribute('aria-valuemax')).to.be.false;
 			expect(slider.hasAttribute('aria-valuemin')).to.be.false;
 			expect(slider.hasAttribute('aria-valuenow')).to.be.false;
diff --git a/components/page/test/page-divider-internal.vdiff.js b/components/page/test/page-divider-internal.vdiff.js
index 8268d3f1dcb..908a556ca78 100644
--- a/components/page/test/page-divider-internal.vdiff.js
+++ b/components/page/test/page-divider-internal.vdiff.js
@@ -51,6 +51,24 @@ describe('page-divider-internal', () => {
 		});
 	});
 
+	describe('focus-stay-scrolled', () => {
+		[
+			{ name: 'main', divider: 'side-nav', fixture: pageDividerFixtures.sideNavLongMainBothHeaders },
+			{ name: 'panel', divider: 'supporting', fixture: pageDividerFixtures.supportingLongFooter },
+			{ name: 'immersive-main', divider: 'supporting', fixture: pageDividerFixtures.supportingImmersiveLongMain },
+			{ name: 'immersive-panel', divider: 'side-nav', fixture: pageDividerFixtures.sideNavImmersiveLongFooter }
+		].forEach(test => {
+			it(test.name, async() => {
+				const elem = await fixture(test.fixture, { pagePadding: false, viewport: { width: 1000, height: 400 } });
+				window.scrollTo(0, document.body.scrollHeight);
+				const panel = elem.shadowRoot.querySelector(`.${test.divider}-panel`);
+				panel.scrollTop = panel.scrollHeight;
+				await focusElem(getDivider(elem, test.divider));
+				await expect(elem).to.be.golden({ margin: 0 });
+			});
+		});
+	});
+
 	describe('keyboard', () => {
 		// TO DO once arrow visuals added
 	});