diff --git a/changelog.md b/changelog.md
index 7dc2f29be9..058d0c00f3 100644
--- a/changelog.md
+++ b/changelog.md
@@ -9,6 +9,7 @@
 * [PickerInput]: fixed unnecessary api calls on body open with `minCharsToSearch` prop and search in body
 * [RTE]: fixed image caption not being visible when RTE initially in readonly mode
 * [DatePicker]: fixed body close if date picker input scrolled out from view
+* [Modals]: prevent scrolling to the modal toggler because of focus return after modal close
 
 # 5.11.0 - 15.11.2024
 
diff --git a/uui-components/src/overlays/ModalBlocker.tsx b/uui-components/src/overlays/ModalBlocker.tsx
index 948fb50187..891ead3b58 100644
--- a/uui-components/src/overlays/ModalBlocker.tsx
+++ b/uui-components/src/overlays/ModalBlocker.tsx
@@ -53,7 +53,7 @@ export const ModalBlocker = React.forwardRef<HTMLDivElement, ModalBlockerProps>(
                 onClick={ handleBlockerClick }
                 aria-label="Click to close a modal"
             />
-            <FocusLock autoFocus={ false } returnFocus disabled={ props.disableFocusLock }>
+            <FocusLock autoFocus={ false } returnFocus={ { preventScroll: true } } disabled={ props.disableFocusLock }>
                 {props.children}
             </FocusLock>
         </div>