diff --git a/platform/commonUI/edit/res/templates/edit-object.html b/platform/commonUI/edit/res/templates/edit-object.html
index f73bf9afd0..af819e8fda 100644
--- a/platform/commonUI/edit/res/templates/edit-object.html
+++ b/platform/commonUI/edit/res/templates/edit-object.html
@@ -54,7 +54,8 @@
                             >
                             <mct-container key="accordion" label="Library">
                                 <mct-representation key="'tree'"
-                                                    mct-object="editPanes.getRoot()">
+                                                    mct-object="editPanes.getRoot()"
+                                                    ng-model="ngModel">
                                 </mct-representation>
                             </mct-container>
                         </div>
@@ -64,7 +65,9 @@
                             ng-controller="ToggleController as toggle"
                             >
                             <mct-container key="accordion" label="Elements">
-                                <mct-representation key="'edit-elements'" mct-object="domainObject">
+                                <mct-representation key="'edit-elements'"
+                                                    mct-object="domainObject"
+                                                    ng-model="ngModel">
                                 </mct-representation>
                             </mct-container>
                         </div>
diff --git a/platform/commonUI/edit/res/templates/elements.html b/platform/commonUI/edit/res/templates/elements.html
index fff8ebd614..d41f0b5beb 100644
--- a/platform/commonUI/edit/res/templates/elements.html
+++ b/platform/commonUI/edit/res/templates/elements.html
@@ -24,7 +24,9 @@
     <ul class="tree">
         <li ng-repeat="containedObject in composition">
             <span class="tree-item">
-                <mct-representation key="'label'" mct-object="containedObject">
+                <mct-representation key="'label'"
+                                    mct-object="containedObject"
+                                    ng-click="ngModel.inspectionObjects = [containedObject]">
                 </mct-representation>
             </span>
         </li>
diff --git a/platform/commonUI/general/res/templates/tree-node.html b/platform/commonUI/general/res/templates/tree-node.html
index 1228604b2e..631c2e5cd4 100644
--- a/platform/commonUI/general/res/templates/tree-node.html
+++ b/platform/commonUI/general/res/templates/tree-node.html
@@ -21,10 +21,9 @@
 -->
 <span ng-controller="ToggleController as toggle">
     <span ng-controller="TreeNodeController as treeNode">
-        <span
-            class="tree-item menus-to-left"
-            ng-class="{selected: treeNode.isSelected()}"
-            >
+        <span class="tree-item menus-to-left"
+              ng-class="{selected: treeNode.isSelected()}"
+              ng-click="ngModel.inspectionObjects = [domainObject]">
             <span
                 class='ui-symbol view-control'
                 ng-click="toggle.toggle(); treeNode.trackExpansion()"