diff --git a/packages/react/src/ActionMenu/ActionMenu.module.css b/packages/react/src/ActionMenu/ActionMenu.module.css
index bf53241a248..af8f43f9067 100644
--- a/packages/react/src/ActionMenu/ActionMenu.module.css
+++ b/packages/react/src/ActionMenu/ActionMenu.module.css
@@ -25,23 +25,23 @@
 
   /* Max-height size tokens (mirror Overlay sizes) */
   &:where([data-max-height-xsmall]) {
-    max-height: min(192px, 100vh);
+    max-height: min(192px, 100dvh);
   }
 
   &:where([data-max-height-small]) {
-    max-height: min(256px, 100vh);
+    max-height: min(256px, 100dvh);
   }
 
   &:where([data-max-height-medium]) {
-    max-height: min(320px, 100vh);
+    max-height: min(320px, 100dvh);
   }
 
   &:where([data-max-height-large]) {
-    max-height: min(432px, 100vh);
+    max-height: min(432px, 100dvh);
   }
 
   &:where([data-max-height-xlarge]) {
-    max-height: min(600px, 100vh);
+    max-height: min(600px, 100dvh);
   }
 
   &:where([data-max-height-fit-content]) {
diff --git a/packages/react/src/Overlay/Overlay.features.stories.module.css b/packages/react/src/Overlay/Overlay.features.stories.module.css
index 78f75790cae..a2cc00ab3a2 100644
--- a/packages/react/src/Overlay/Overlay.features.stories.module.css
+++ b/packages/react/src/Overlay/Overlay.features.stories.module.css
@@ -164,6 +164,7 @@
 }
 
 .ScrollableContent {
+  position: relative;
   padding: var(--base-size-16);
   display: flex;
   flex-direction: column;
diff --git a/packages/react/src/Overlay/Overlay.features.stories.tsx b/packages/react/src/Overlay/Overlay.features.stories.tsx
index da17f356a7a..c634b9e7313 100644
--- a/packages/react/src/Overlay/Overlay.features.stories.tsx
+++ b/packages/react/src/Overlay/Overlay.features.stories.tsx
@@ -644,6 +644,7 @@ export const SettingMaxHeight = () => {
         >
           <div className={classes.ScrollableContent}>
             <IconButton
+              ref={confirmButtonRef}
               aria-label="Close"
               onClick={closeOverlay}
               icon={XIcon}
diff --git a/packages/react/src/Overlay/Overlay.module.css b/packages/react/src/Overlay/Overlay.module.css
index 1cf169469e6..4ee3e39b3a2 100644
--- a/packages/react/src/Overlay/Overlay.module.css
+++ b/packages/react/src/Overlay/Overlay.module.css
@@ -87,23 +87,23 @@
   }
 
   &:where([data-max-height-xsmall]) {
-    max-height: min(192px, 100vh);
+    max-height: min(192px, 100dvh);
   }
 
   &:where([data-max-height-small]) {
-    max-height: min(256px, 100vh);
+    max-height: min(256px, 100dvh);
   }
 
   &:where([data-max-height-medium]) {
-    max-height: min(320px, 100vh);
+    max-height: min(320px, 100dvh);
   }
 
   &:where([data-max-height-large]) {
-    max-height: min(432px, 100vh);
+    max-height: min(432px, 100dvh);
   }
 
   &:where([data-max-height-xlarge]) {
-    max-height: min(600px, 100vh);
+    max-height: min(600px, 100dvh);
   }
 
   &:where([data-max-height-fit-content]) {