diff --git a/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.html b/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.html
index 75adccd..bbf3d15 100644
--- a/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.html
+++ b/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.html
@@ -13,7 +13,7 @@
               <option *ngFor="let l of layers;" [value]="l.index">{{l.name}}</option>
             </select>
           </div>
-          <fm-map-layer-legend [layer]="layers[itemLayer.layerIndex]" [histogramenabled]="true"></fm-map-layer-legend>
+          <fm-map-layer-legend [layer]="layer(layers,itemLayer.layerIndex)" [histogramenabled]="true"></fm-map-layer-legend>
         </div>
       </div>
       <div class="card menu-card">
diff --git a/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.ts b/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.ts
index 1cdc1b2..dbc8814 100644
--- a/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.ts
+++ b/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.ts
@@ -27,4 +27,8 @@ export class SelectedItemGeotiffComponent extends AbstractSelectedItemComponent
     this.selectedLayer = layerIndex;
     this.store.dispatch(new mapActions.SetLayerIndex(layerIndex));
   }
+
+  layer(layers:any,layerIndex:number) {
+    return layers.find(l => l.index == layerIndex);
+  }
 }
diff --git a/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.html b/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.html
index 63ff300..d1859af 100644
--- a/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.html
+++ b/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.html
@@ -13,7 +13,7 @@
               <option *ngFor="let l of layers;" [value]="l.index">{{l.name}}</option>
             </select>
           </div>
-          <fm-map-layer-legend [showTitle]="layers.length==1" [layer]="layers[itemLayer.layerIndex]" [histogramenabled]="true"></fm-map-layer-legend>
+          <fm-map-layer-legend [showTitle]="layers.length==1" [layer]="layer(layers,itemLayer.layerIndex)" [histogramenabled]="true"></fm-map-layer-legend>
         </div>
       </div>
       <div class="card menu-card">
diff --git a/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.ts b/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.ts
index 2b54f5b..daf0ef9 100644
--- a/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.ts
+++ b/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.ts
@@ -27,4 +27,8 @@ export class SelectedItemShapeComponent extends AbstractSelectedItemComponent {
   onLayerChanged(layerIndex: number) {
     this.store.dispatch(new mapActions.SetLayerIndex(layerIndex));
   }
+  
+  layer(layers:any,layerIndex:number) {
+    return layers.find(l => l.index == layerIndex);
+  }
 }
diff --git a/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html b/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html
index ed64370..2fcae7f 100644
--- a/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html
+++ b/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html
@@ -14,7 +14,7 @@
               <option *ngFor="let l of layers;" [value]="l.index">{{l.name}}</option>
             </select>
           </div>
-          <fm-map-layer-legend [layer]="layers[itemLayer.layerIndex]" [histogramenabled]="true"></fm-map-layer-legend>
+          <fm-map-layer-legend [layer]="layer(layers,itemLayer.layerIndex)" [histogramenabled]="true"></fm-map-layer-legend>
         </div>
       </div>
       <div class="card menu-card">
diff --git a/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts b/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts
index c546a98..3982fcc 100644
--- a/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts
+++ b/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts
@@ -68,4 +68,8 @@ export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent
     }
     return null;
   }  
+
+  layer(layers:any,layerIndex:number) {
+    return layers.find(l => l.index == layerIndex);
+  }
 }