diff --git a/platform/commonUI/general/res/templates/tree-node.html b/platform/commonUI/general/res/templates/tree-node.html
index 1d5559e668..a40cb9fd7b 100644
--- a/platform/commonUI/general/res/templates/tree-node.html
+++ b/platform/commonUI/general/res/templates/tree-node.html
@@ -29,8 +29,9 @@
                 key="'label'"
 				mct-object="domainObject"
 				ng-model="ngModel"
-				ng-click="!treeNode.checkMobile() || model.composition == undefined ?
-				ngModel.selectedObject = domainObject : toggle.toggle(); treeNode.trackExpansion()"
+				ng-click="!treeNode.checkMobile() || model.composition == undefined ||
+                          model.composition.length == 0 ? ngModel.selectedObject = domainObject : toggle.toggle();
+                          treeNode.trackExpansion()"
 				>
             </mct-representation>
             <span