Merge branch 'refs/heads/master' into components

1 files changed, 9 insertions, 0 deletions

diff --git a/js/panels/properties/content.reel/content.js b/js/panels/properties/content.reel/content.js
index 1ec6d769..53926c78 100644..100755
--- a/js/panels/properties/content.reel/content.js
+++ b/js/panels/properties/content.reel/content.js
@@ -54,8 +54,17 @@ exports.Content = Montage.create(Component, {
                 this.eventManager.addEventListener( "elementChanging", this, false);
             }
 
+            this.eventManager.addEventListener("openDocument", this, false);
+        }
+    },
+
+    // Document is opened - Display the current selection
+    handleOpenDocument: {
+        value: function() {
+
             this.eventManager.addEventListener( "elementChange", this, false);
 
+            // For now always assume that the stage is selected by default
             if(this.application.ninja.selectedElements.length === 0) {
                 this.displayStageProperties();
             }