diff --git a/src/components/StationAndTrainSearch.tsx b/src/components/StationAndTrainSearch.tsx
index cc9139f8..5d293a97 100644
--- a/src/components/StationAndTrainSearch.tsx
+++ b/src/components/StationAndTrainSearch.tsx
@@ -132,12 +132,6 @@ export default function StationAndTrainSearch() {
         open={open}
         onClose={handleClose}
         TransitionComponent={SlideUpTransition}
-        PaperProps={{
-          sx: {
-            // Temporary fix until new patch of MUI is released with https://github.com/mui/material-ui/pull/43626
-            overflowY: 'auto',
-          },
-        }}
       >
         <AppBar position="fixed" elevation={0}>
           <Toolbar>
diff --git a/src/theme.ts b/src/theme.ts
index bd7ac19a..5974524a 100644
--- a/src/theme.ts
+++ b/src/theme.ts
@@ -116,6 +116,23 @@ const baseTheme: CssVarsThemeOptions = {
         },
       },
     },
+    MuiDialog: {
+      styleOverrides: {
+        root: {
+          variants: [
+            {
+              props: { scroll: 'paper' },
+              style: {
+                '& .MuiPaper-root': {
+                  // Temporary fix until new patch of MUI is released with https://github.com/mui/material-ui/pull/43626
+                  overflowY: 'auto',
+                },
+              },
+            },
+          ],
+        },
+      },
+    },
   },
 };