diff --git a/src/components/AppDialog.jsx b/src/components/AppDialog.jsx
index 4a25166..d0571cf 100644
--- a/src/components/AppDialog.jsx
+++ b/src/components/AppDialog.jsx
@@ -60,6 +60,7 @@ class AppDialog extends Component {
       transitionDuration: _transitionDuration,
       TransitionProps: _transitionProps,
       TransitionComponent: _transitionComponent,
+      disableScrollLock = true,
       slotProps: userSlotProps,
       slots: userSlots,
       ...rest
@@ -95,6 +96,7 @@ class AppDialog extends Component {
 
     return (
       <Dialog
+        disableScrollLock={disableScrollLock}
         disableEnforceFocus
         {...rest}
         slots={restSlots}
diff --git a/src/components/brand/BrandImageSearchDialog.jsx b/src/components/brand/BrandImageSearchDialog.jsx
index 7d8aa5a..8913c84 100644
--- a/src/components/brand/BrandImageSearchDialog.jsx
+++ b/src/components/brand/BrandImageSearchDialog.jsx
@@ -290,7 +290,7 @@ export default class BrandImageSearchDialog extends PureComponent {
           </IconButton>
         </DialogTitle>
 
-        <DialogContent dividers sx={{ p: 2.5 }}>
+        <DialogContent dividers>
           {/* Search bar */}
           <Box
             component="form"
diff --git a/src/theme/themes/default.js b/src/theme/themes/default.js
index b3e8007..90cc239 100644
--- a/src/theme/themes/default.js
+++ b/src/theme/themes/default.js
@@ -44,9 +44,20 @@ export function createDefaultTheme() {
     },
     nav,
     components: {
+      MuiModal: {
+        defaultProps: {
+          disableScrollLock: true,
+        },
+      },
+      MuiDialog: {
+        defaultProps: {
+          disableScrollLock: true,
+        },
+      },
       MuiMenu: {
         defaultProps: {
           transitionDuration: 0,
+          disableScrollLock: true,
         },
       },
       MuiButton: {
@@ -79,6 +90,7 @@ export function createDefaultTheme() {
       MuiPopover: {
         defaultProps: {
           transitionDuration: 0,
+          disableScrollLock: true,
         },
       },
     },