diff --git a/projects/common-map/src/fm-map/components/selected-item-container/selected-item-container.component.ts b/projects/common-map/src/fm-map/components/selected-item-container/selected-item-container.component.ts
index 716013f..5681c68 100644
--- a/projects/common-map/src/fm-map/components/selected-item-container/selected-item-container.component.ts
+++ b/projects/common-map/src/fm-map/components/selected-item-container/selected-item-container.component.ts
@@ -29,7 +29,8 @@ export class SelectedItemContainerComponent {
       componentFactory = this.componentFactoryResolver.resolveComponentFactory(firstComponentWithTypeAndTask['constructor'] as any);
     } else {
       let firstComponentWithType = this.selectedItemComponents
-        .find(value => value['forItemType'] == this.item.itemType);
+        .find(value => value['forSourceTask'] == null &&
+          value['forItemType'] == this.item.itemType);
 
       if (firstComponentWithType) {
         componentFactory = this.componentFactoryResolver.resolveComponentFactory(firstComponentWithType['constructor'] as any);