2 files changed, 8 insertions, 3 deletions

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index ab4eed84..d9bebc36 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -345,7 +345,10 @@
             },
 
             "codeEditorController": {
-                "prototype": "js/controllers/code-editor-controller"
+                "prototype": "js/controllers/code-editor-controller",
+                "bindings": {
+                    "currentDocument": {"<-": "@documentList.selectedObjects.0"}
+                }
             },
 
             "owner": {
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index 987c32fd..3c60bb41 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -306,8 +306,10 @@ exports.Ninja = Montage.create(Component, {
             // TODO: Remove this when integrating the next montage
             this.documentList.selectedObjects = [doc];
 
-            // TODO: Bind directly to the model of the document in components instead of this property
-            this.currentSelectedContainer = doc.model.documentRoot;
+            if(doc.currentView === "design") {
+                // TODO: Bind directly to the model of the document in components instead of this property
+                this.currentSelectedContainer = doc.model.documentRoot;
+            }
 
 //            if(this.currentDocument.model.documentRoot) {
 //                this.currentSelectedContainer = this.currentDocument.model.documentRoot;