diff --git a/platform/commonUI/general/src/ui/TreeView.js b/platform/commonUI/general/src/ui/TreeView.js
index b09256388d..b1b394ae4c 100644
--- a/platform/commonUI/general/src/ui/TreeView.js
+++ b/platform/commonUI/general/src/ui/TreeView.js
@@ -60,8 +60,9 @@ define([
         }
     };
 
-    TreeView.prototype.loadComposition = function (domainObject) {
-        var self = this;
+    TreeView.prototype.loadComposition = function () {
+        var self = this,
+            domainObject = this.activeObject;
 
         function addNode(domainObject, index) {
             self.nodeViews[index].model(domainObject);
diff --git a/platform/commonUI/general/test/ui/TreeViewSpec.js b/platform/commonUI/general/test/ui/TreeViewSpec.js
index 370e5c8e10..adb270f47e 100644
--- a/platform/commonUI/general/test/ui/TreeViewSpec.js
+++ b/platform/commonUI/general/test/ui/TreeViewSpec.js
@@ -161,7 +161,7 @@ define([
                 beforeEach(function () {
                     mockComposition.pop();
                     testCapabilities.mutation.listen
-                        .mostRecentCall.args[0](mockDomainObject);
+                        .mostRecentCall.args[0](mockDomainObject.getModel());
                     waitForCompositionCallback();
                 });