2 files changed, 22 insertions, 6 deletions

diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index d05fb058..934a3851 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -28,15 +28,17 @@ exports.Properties = Montage.create(Component, {
 
             this._currentDocument = value;
 
-            if(!value) {
+//            if(!value) {
                 this.clear();
-            } else if(this._currentDocument.currentView === "design") {
-                // Save a reference of the pi inside the document view to be able to clear
-                this._currentDocument.model.views.design.propertiesPanel = this;
+//            }
 
+            /*
+            else if(this._currentDocument.currentView === "design") {
                 // Display the default document root PI
-                this.displayElementProperties(this._currentDocument.model.documentRoot);
+                //this.displayElementProperties(this._currentDocument.model.documentRoot);
+//                this.displaySelection(this._currentDocument.model.selection);
             }
+            */
         }
     },
 
@@ -181,6 +183,20 @@ exports.Properties = Montage.create(Component, {
         }
     },
 
+    displaySelection: {
+        value: function(selection) {
+            if(selection.length === 0) {
+                this.displayElementProperties(this._currentDocument.model.documentRoot);
+            } else {
+                if(selection.length === 1) {
+                    this.displayElementProperties(this.application.ninja.selectedElements[0]);
+                } else {
+                    this.displayGroupProperties(this.application.ninja.selectedElements);
+                }
+            }
+        }
+    },
+
     clear: {
         value: function() {
             this.elementName.value = "";
diff --git a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js
index 49907c9d..104d474d 100755
--- a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js
+++ b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js
@@ -213,7 +213,7 @@ exports.ThreeD = Montage.create(Component, {
 
             this._currentDocument = value;
 
-            if(this._currentDocument.currentView === "design") {
+            if(this._currentDocument && this._currentDocument.currentView === "design") {
                 // Save a reference of the pi inside the document view to be able to clear
                 Object.defineBinding(this, "item", {
                     boundObject: this,