diff --git a/package.json b/package.json
index 604d15a..99b55bc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bbodek-ui",
-  "version": "0.0.277",
+  "version": "0.0.280",
   "type": "module",
   "author": "Bbodek",
   "license": "MIT",
diff --git a/src/core/components/BottomSheet/index.tsx b/src/core/components/BottomSheet/index.tsx
index f510612..0a8f8b4 100644
--- a/src/core/components/BottomSheet/index.tsx
+++ b/src/core/components/BottomSheet/index.tsx
@@ -38,7 +38,7 @@ const BottomSheet = forwardRef(
       >
         <div
           className={clsx(
-            'animate-bottom-sheet overflow-y-hidden p-4',
+            'animate-bottom-sheet overflow-y-hidden px-4 pt-4',
             BOTTOM_SHEET_ROUNDED_VARIANTS_MAPPER[rounded],
             className,
           )}
diff --git a/src/core/components/Modal/ModalBase/constants/index.ts b/src/core/components/Modal/ModalBase/constants/index.ts
index f70b6c4..3148878 100644
--- a/src/core/components/Modal/ModalBase/constants/index.ts
+++ b/src/core/components/Modal/ModalBase/constants/index.ts
@@ -7,8 +7,7 @@ export const VARIANTS = {
 } as const;
 
 export const MODAL_CONTENT_POSITION: Record<VariantsType, string> = {
-  [VARIANTS.MODAL]:
-    'fixed flex items-center justify-center z-50 safe-area-bottom',
+  [VARIANTS.MODAL]: 'fixed flex items-center justify-center z-50',
   [VARIANTS.DRAWER]: 'flex justify-end z-40',
   [VARIANTS.BOTTOM_SHEET]: 'fixed flex justify-center items-end z-50',
 } as const;
@@ -21,6 +20,6 @@ export const MODAL_DIMMED_COLOR: Record<VariantsType, string> = {
 
 export const MODAL_CONTENT_SIZE: Record<VariantsType, string> = {
   [VARIANTS.MODAL]: 'h-auto',
-  [VARIANTS.DRAWER]: 'h-full safe-area-bottom',
-  [VARIANTS.BOTTOM_SHEET]: 'h-auto safe-area-bottom bg-white',
+  [VARIANTS.DRAWER]: 'h-full',
+  [VARIANTS.BOTTOM_SHEET]: 'h-auto safe-area-bottom-pb bg-white',
 } as const;
diff --git a/src/core/components/Modal/ModalBase/index.tsx b/src/core/components/Modal/ModalBase/index.tsx
index 451fef4..aada19d 100644
--- a/src/core/components/Modal/ModalBase/index.tsx
+++ b/src/core/components/Modal/ModalBase/index.tsx
@@ -67,8 +67,8 @@ const ModalBase = forwardRef(
           {cloneElement(_children, {
             ref: contentRef,
             className: clsx(
-              MODAL_CONTENT_SIZE[variants],
               _children.props.className,
+              MODAL_CONTENT_SIZE[variants],
             ),
           })}
         </dialog>
diff --git a/src/core/components/Modal/ModalPopUp/index.tsx b/src/core/components/Modal/ModalPopUp/index.tsx
index b35ec75..289c733 100644
--- a/src/core/components/Modal/ModalPopUp/index.tsx
+++ b/src/core/components/Modal/ModalPopUp/index.tsx
@@ -1,7 +1,5 @@
 import clsx from 'clsx';
 import { forwardRef, PropsWithChildren } from 'react';
-
-import { useBlockScrollingEffect } from '@/hooks/effects/useBlockScrollingEffect';
 import Section from '../../Section';
 import ModalBase from '../ModalBase';
 import { VARIANTS } from '../ModalBase/constants';
@@ -23,8 +21,6 @@ const ModalPopUp = forwardRef(
   ) => {
     const { target, className, ...rest } = props;
 
-    useBlockScrollingEffect(isOpen);
-
     return (
       <ModalBase
         target={target ?? 'portal'}
diff --git a/src/styles/bbodek-theme.css b/src/styles/bbodek-theme.css
index 58cf67a..b9687d5 100644
--- a/src/styles/bbodek-theme.css
+++ b/src/styles/bbodek-theme.css
@@ -90,6 +90,12 @@
     padding-bottom: calc(env(safe-area-inset-bottom));
   }
 
+  .safe-area-bottom-pb {
+    padding-bottom: 1rem;
+    padding-bottom: calc(constant(safe-area-inset-bottom + 1rem));
+    padding-bottom: calc(env(safe-area-inset-bottom + 1rem));
+  }
+
   .safe-area-y {
     @apply safe-area-top safe-area-bottom;
   }