From 9358a836647051f0edc3c799af6ac15a461f81c5 Mon Sep 17 00:00:00 2001
From: Steph Baker <steph.baker@shopify.com>
Date: Thu, 28 Sep 2023 13:21:48 +0000
Subject: [PATCH] [Modal] disallow scroll if modal has no scroll set to true

Co-authored-by: kellydanma <kelly.ma@mail.mcgill.ca>
---
 .changeset/two-phones-move.md                | 5 +++++
 polaris-react/src/components/Modal/Modal.tsx | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/two-phones-move.md

diff --git a/.changeset/two-phones-move.md b/.changeset/two-phones-move.md
new file mode 100644
index 00000000000..e40163c0e2c
--- /dev/null
+++ b/.changeset/two-phones-move.md
@@ -0,0 +1,5 @@
+---
+'@shopify/polaris': patch
+---
+
+[Modal] Disallow vertical scroll with use of noScroll
diff --git a/polaris-react/src/components/Modal/Modal.tsx b/polaris-react/src/components/Modal/Modal.tsx
index cfa2877a6ba..4bd24bafdd3 100644
--- a/polaris-react/src/components/Modal/Modal.tsx
+++ b/polaris-react/src/components/Modal/Modal.tsx
@@ -165,7 +165,7 @@ export const Modal: React.FunctionComponent<ModalProps> & {
     );
 
     const scrollContainerMarkup = noScroll ? (
-      <Box width="100%" overflowX="hidden">
+      <Box width="100%" overflowX="hidden" overflowY="hidden">
         {body}
       </Box>
     ) : (