diff --git a/platform/commonUI/browse/res/templates/browse-object.html b/platform/commonUI/browse/res/templates/browse-object.html
index fb5dfff0a0..8291d1ed29 100644
--- a/platform/commonUI/browse/res/templates/browse-object.html
+++ b/platform/commonUI/browse/res/templates/browse-object.html
@@ -21,15 +21,15 @@
 -->
 <span ng-controller="BrowseObjectController">
     
-    <div class="object-browse-bar bar abs">
+    <div class="object-browse-bar bar abs"
+         ng-click="ngModel.inspectionObjects = [domainObject]">
         
         <div class="pane-tabs left"
              ng-class="{inactivePane: !ngModel.leftPane, activePane: ngModel.leftPane}"
              ng-click="ngModel.leftPane = !ngModel.leftPane">
         </div>
         
-        <div class="items-select left abs"
-             ng-click="ngModel.inspectionObjects = [domainObject]">
+        <div class="items-select left abs">
             <mct-representation key="'object-header'" mct-object="domainObject">
             </mct-representation>
         </div>
diff --git a/platform/features/layout/res/templates/frame.html b/platform/features/layout/res/templates/frame.html
index df4e3390ad..3817ff6ba8 100644
--- a/platform/features/layout/res/templates/frame.html
+++ b/platform/features/layout/res/templates/frame.html
@@ -35,7 +35,8 @@
     </div>
     <div class="abs object-holder">
         <mct-representation key="representation.selected.key"
-                            mct-object="representation.selected.key && domainObject">
+                            mct-object="representation.selected.key && domainObject"
+                            ng-model="ngModel">
         </mct-representation>
     </div>
 </div>
\ No newline at end of file
diff --git a/platform/features/layout/res/templates/layout.html b/platform/features/layout/res/templates/layout.html
index 6d6effdc85..ce1c6e0faf 100644
--- a/platform/features/layout/res/templates/layout.html
+++ b/platform/features/layout/res/templates/layout.html
@@ -20,16 +20,18 @@
  at runtime from the About dialog for additional information.
 -->
 <div style="width: 100%; height: 100%;"
-     ng-controller="LayoutController as controller">
+     ng-controller="LayoutController as controller"
+     ng-mousedown="ngModel.inspectionObjects = [domainObject]">
 
     <div class='frame child-frame panel abs'
          ng-repeat="childObject in composition"
          ng-style="controller.getFrameStyle(childObject.getId())"
-         ng-mousedown="ngModel.inspectionObjects = [childObject]">
+         ng-mousedown="ngModel.inspectionObjects = [childObject]; $event.stopPropagation()">
 
         <div class="frame child-frame holder contents abs">
             <mct-representation key="'frame'"
-                                mct-object="childObject">
+                                mct-object="childObject"
+                                ng-model="ngModel">
             </mct-representation>
         </div>