Merge branch 'master' into pentool

2 files changed, 3 insertions, 3 deletions

diff --git a/js/panels/components-panel.reel/components-panel.js b/js/panels/components-panel.reel/components-panel.js
index 5d3c0a73..79eac37b 100755
--- a/js/panels/components-panel.reel/components-panel.js
+++ b/js/panels/components-panel.reel/components-panel.js
@@ -8,7 +8,6 @@ var Montage     = require("montage/core/core").Montage,
     Component   = require("montage/ui/component").Component,
     NJUtils     = require("js/lib/NJUtils").NJUtils;
 
-var treeControlModule   = require("js/components/tree.reel");
 var PIData              = require("js/data/pi/pi-data").PiData;
 
 String.prototype.capitalizeFirstChar = function() {
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index d9dca538..b21014c1 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -73,8 +73,9 @@ exports.Properties = Montage.create(Component, {
 
             this.eventManager.addEventListener( "elementChange", this, false);
 
-            // For now always assume that the stage is selected by default
-            if(this.application.ninja.selectedElements.length === 0) {
+            // For now always assume that the stage is selected by default when opening the old template
+            // TODO: Remove marker for old template: NINJA-STAGE-REWORK
+            if(this.application.ninja.selectedElements.length === 0 && this.application.ninja.currentDocument.documentRoot.nodeName.toLowerCase() !== "body") {
                 this.displayStageProperties();
             }
         }