diff --git a/src/components/layout/drawer/Extras.jsx b/src/components/layout/drawer/Extras.jsx
index 4cc36bb68..ce3959ce7 100644
--- a/src/components/layout/drawer/Extras.jsx
+++ b/src/components/layout/drawer/Extras.jsx
@@ -47,14 +47,15 @@ const BaseS2Cells = () => {
   const enabled = useStore((s) => !!s.filters.s2cells.enabled)
   const [filters, setFilters] = useDeepStore('filters.s2cells.cells')
   const safe = React.useMemo(() => filters || [], [filters])
-  if (!filters) return null
   return (
     <CollapsibleItem open={enabled}>
       <ListItem>
         <Select
           sx={{ mx: 'auto', width: '90%' }}
           value={safe}
-          renderValue={(selected) => selected.join(', ')}
+          renderValue={(selected) =>
+            Array.isArray(selected) ? selected.join(', ') : selected
+          }
           multiple
           onChange={({ target }) =>
             setFilters(
diff --git a/src/components/layout/drawer/Section.jsx b/src/components/layout/drawer/Section.jsx
index f7d9bc584..c3af37269 100644
--- a/src/components/layout/drawer/Section.jsx
+++ b/src/components/layout/drawer/Section.jsx
@@ -72,8 +72,6 @@ const DrawerSection = ({ category }) => {
         <List>
           {category === 'pokemon' ? (
             <PokemonDrawerMemo />
-          ) : category === 'scanAreas' ? (
-            <Areas />
           ) : category === 'settings' ? (
             <SettingsMenu />
           ) : (
@@ -107,6 +105,7 @@ const DrawerSection = ({ category }) => {
               <ListItemText primary={t('advanced')} />
             </ListItemButton>
           )}
+          {category === 'scanAreas' && <Areas />}
         </List>
       </AccordionDetails>
     </Accordion>