diff --git a/react-app/src/components/map/clusterPopup/ClusterPopup.tsx b/react-app/src/components/map/clusterPopup/ClusterPopup.tsx
index 20135ff54..9d646f3a6 100644
--- a/react-app/src/components/map/clusterPopup/ClusterPopup.tsx
+++ b/react-app/src/components/map/clusterPopup/ClusterPopup.tsx
@@ -148,7 +148,7 @@ const ClusterPopup = (props: ClusterPopupProps) => {
           </IconButton>
         </Grid>
       </Grid>
-      <Box overflow={'scroll'}>
+      <Box sx={{ overflowY: 'scroll' }}>
         {popupState.properties.map((property) => (
           <PropertyRow
             key={`${property.properties.PropertyTypeId === PropertyTypes.BUILDING ? 'Building' : 'Land'}-${property.properties.Id}`}
diff --git a/react-app/src/components/map/controls/FilterControl.tsx b/react-app/src/components/map/controls/FilterControl.tsx
index a5675ea83..510f7327a 100644
--- a/react-app/src/components/map/controls/FilterControl.tsx
+++ b/react-app/src/components/map/controls/FilterControl.tsx
@@ -58,6 +58,8 @@ const FilterControl = (props: FilterControlProps) => {
     <Box
       sx={{
         padding: '1em',
+        overflowY: 'scroll',
+        scrollbarWidth: 'none',
       }}
     >
       <FormProvider {...formMethods}>
diff --git a/react-app/src/components/map/sidebar/MapSidebar.tsx b/react-app/src/components/map/sidebar/MapSidebar.tsx
index 1e42bccd3..4a00d846d 100644
--- a/react-app/src/components/map/sidebar/MapSidebar.tsx
+++ b/react-app/src/components/map/sidebar/MapSidebar.tsx
@@ -134,7 +134,7 @@ const MapSidebar = (props: MapSidebarProps) => {
         </Grid>
 
         {/* List of Properties */}
-        <Box overflow={'scroll'} height={'100%'} display={'flex'} flexDirection={'column'}>
+        <Box height={'100%'} display={'flex'} flexDirection={'column'} sx={{ overflowY: 'scroll' }}>
           {propertiesInBounds
             .slice(pageIndex * propertyPageSize, pageIndex * propertyPageSize + propertyPageSize)
             .map((property) => (