diff --git a/src/Map.js b/src/Map.js
index 9f973c5..50e4239 100644
--- a/src/Map.js
+++ b/src/Map.js
@@ -73,6 +73,18 @@ function list_polygons(request, center, ratio, ind, cb, selectedRoom)
   return polygons;
 }
 
+function containsRoom(request, selectedRoom)
+{
+  for (const k in request)
+  {
+    if (k === selectedRoom)
+    {
+      return 1;
+    }
+  }
+  return 0;
+}
+
 function layers_list(requestList, cb, selectedRoom)
 {
   let layers = [];
@@ -89,7 +101,8 @@ function layers_list(requestList, cb, selectedRoom)
 //    console.log((maxX-minX)/135);
 //    console.log(ratio);
     const polygons = list_polygons(request, center, ratio, ind, cb, selectedRoom);
-    layers = [...layers, <LayersControl.BaseLayer checked={ind === 1 ? true : false} name={"Floor "+String(ind+2)} key={ind}><LayerGroup> {polygons} </LayerGroup></LayersControl.BaseLayer>];
+    const floorContainsSelectedRoom = containsRoom(request, selectedRoom);
+    layers = [...layers, <LayersControl.BaseLayer checked={ (floorContainsSelectedRoom === 1 || (selectedRoom === null && ind === 1)) ? true : false} name={"Floor "+String(ind+2)} key={ind}><LayerGroup> {polygons} </LayerGroup></LayersControl.BaseLayer>];
   })
   return layers;
 }