1 files changed, 8 insertions, 0 deletions
diff --git a/modern/src/main/MainPage.js b/modern/src/main/MainPage.js
index f9341eb6..41e51609 100644
--- a/modern/src/main/MainPage.js
+++ b/modern/src/main/MainPage.js
@@ -129,6 +129,8 @@ const MainPage = () => {
   const desktop = useMediaQuery(theme.breakpoints.up('md'));
   const phone = useMediaQuery(theme.breakpoints.down('sm'));
 
+  const [mapMapOnSelect] = usePersistedState('mapOnSelect', false);
+
   const [mapLiveRoutes] = usePersistedState('mapLiveRoutes', false);
 
   const selectedDeviceId = useSelector((state) => state.devices.selectedId);
@@ -143,6 +145,12 @@ const MainPage = () => {
 
   useEffect(() => setCollapsed(!desktop), [desktop]);
 
+  useEffect(() => {
+    if (!desktop && mapMapOnSelect && selectedDeviceId) {
+      setCollapsed(true);
+    }
+  }, [desktop, mapMapOnSelect, selectedDeviceId]);
+
   const onClick = useCallback((_, deviceId) => {
     dispatch(devicesActions.select(deviceId));
   }, [dispatch]);