5 files changed, 18 insertions, 5 deletions

diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js
index 7a26ed3b..4b031d70 100755
--- a/js/controllers/selection-controller.js
+++ b/js/controllers/selection-controller.js
@@ -58,13 +58,13 @@ exports.SelectionController = Montage.create(Component, {
                 return;
             }
 
-            if(this._currentDocument && this._currentDocument.currentView === "design") {
+            if(this._currentDocument && (this._currentDocument.currentView === "design" || this._currentDocument.model.currentView.identifier !== "code")) {
                 this._currentDocument.model._selection = this.application.ninja.selectedElements;
             }
 
             this._currentDocument = value;
 
-            if(this._currentDocument && this._currentDocument.currentView === "design") {
+            if(this._currentDocument && (this._currentDocument.currentView === "design" || this._currentDocument.model.currentView.identifier !== "code")) {
                 this.selectedElements = this._currentDocument.model.selection;
             }
             /*
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index e95c6614..68d031fb 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -87,7 +87,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
         set : function(document) {
             ///// If the document is null set default stylesheets to null
 
-            if(!document || document.currentView === "code") {
+            if(!document || (document.currentView === "code" && document.model.currentView.identifier !== "design-code")) {
                 this._currentDocument   = null;
                 this._stageStylesheet  = null;
                 this.defaultStylesheet = null;
diff --git a/js/panels/Panel.reel/Panel.js b/js/panels/Panel.reel/Panel.js
index 988088e3..586636e1 100755
--- a/js/panels/Panel.reel/Panel.js
+++ b/js/panels/Panel.reel/Panel.js
@@ -159,11 +159,24 @@ exports.Panel = Montage.create(Component, {
                 this.disabled = true;
             } else {
                 this.disabled = this._currentDocument.currentView !== "design";
+                this._currentDocument.addPropertyChangeListener("model.currentViewIdentifier", this, false);
             }
 
         }
     },
 
+    handleChange: {
+        value: function(notification) {
+            if(notification.currentPropertyPath === "model.currentViewIdentifier") {
+                if(this.currentDocument.model.currentView.identifier === "design-code") {
+                    this.disabled = true;
+                } else {
+                    this.disabled = false;
+                }
+            }
+        }
+    },
+
     handleBtnCollapseAction: {
         value: function() {
             this.collapsed = !this.collapsed;
diff --git a/js/stage/layout.js b/js/stage/layout.js
index 5cc8dbea..5e6e8152 100755
--- a/js/stage/layout.js
+++ b/js/stage/layout.js
@@ -69,7 +69,7 @@ exports.Layout = Montage.create(Component, {
         set : function(value) {
             if (value !== this._currentDocument) {
                 this._currentDocument = value;
-                if(this._currentDocument && this._currentDocument.currentView === "design") {
+                if(this._currentDocument && (this._currentDocument.currentView === "design" || this._currentDocument.model.currentView.identifier !== "code")) {
                     this.elementsToDraw = Array.prototype.slice.call(this._currentDocument.model.documentRoot.childNodes, 0);
                 }
             }
diff --git a/manifest.json b/manifest.json
index 14d8b239..46b444c3 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "Ninja Authoring Tool Preview",
   "description": "Ninja HTML5 Authoring Tool Preview",
-  "version": "0.8.0.0",
+  "version": "0.7.2.0",
   "app": {
     "launch": {
       "local_path": "index.html"