3 files changed, 22 insertions, 8 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 7758f346..3e15511d 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -393,14 +393,20 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
 
     onCloseFile: {
         value: function(doc) {
+            var previousFocusedDocument;
 
-                        this._documents.splice(this._documents.indexOf(doc), 1);
+            this._documents.splice(this._documents.indexOf(doc), 1);
 
-            this._activeDocument = null;
-
-            this.application.ninja.stage.hideRulers();
+            if(this._documents.length > 0) {
+                previousFocusedDocument = this._documents[this._documents.length - 1];
+                this._activeDocument = previousFocusedDocument;
+                this.switchDocuments(this.activeDocument, previousFocusedDocument, true);
+            } else {
+                this._activeDocument = null;
+                this.application.ninja.stage.hideRulers();
 
-            this.application.ninja.stage.hideCanvas(true);
+                this.application.ninja.stage.hideCanvas(true);
+            }
 
             //TODO: Use references for those instead of calling getElementById
             if(this._documents.length === 0){
@@ -524,6 +530,11 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
                     this.application.ninja.stage.hideCanvas(true);
                     this.application.ninja.stage.hideRulers();
                 }
+            }else if(!currentDocument && newDocument.currentView === "code"){
+                this.application.ninja.stage.showCodeViewBar(true);
+                this.application.ninja.stage.collapseAllPanels();
+                this.application.ninja.stage.hideCanvas(true);
+                this.application.ninja.stage.hideRulers();
             }
 
             this.application.ninja.stage.clearAllCanvas();
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index 23a2ce75..2f55edb4 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -88,7 +88,7 @@ exports.KeyboardMediator = Montage.create(Component, {
 
             //keyboard controls for html design view
             // TODO - New template mode doesn't set currentView yet.
-            if((!!this.application.ninja.currentDocument)){// && (this.application.ninja.currentDocument.model.currentView === "design")){
+            if((!!this.application.ninja.currentDocument) && (this.application.ninja.currentDocument.model.currentView === "design")){
 
                 // Don't do anything if an input or other control is focused
                 if(document.activeElement.nodeName !== "BODY") {
diff --git a/js/panels/Splitter.js b/js/panels/Splitter.js
index 0640abb2..f0fb1a45 100755
--- a/js/panels/Splitter.js
+++ b/js/panels/Splitter.js
@@ -111,8 +111,9 @@ exports.Splitter = Montage.create(Component, {
             } else {
                 this.panel.removeEventListener("webkitTransitionEnd", this, false);
             }
-
-            this.application.ninja.stage.resizeCanvases = true;
+            if(this.application.ninja.currentDocument && this.application.ninja.currentDocument.currentView === "design"){
+                this.application.ninja.stage.resizeCanvases = true;
+            }
         }
     },
 
@@ -149,6 +150,7 @@ exports.Splitter = Montage.create(Component, {
                     this.panel.addEventListener("webkitTransitionEnd", this, false);
                 }
                 this._collapsed = true;
+                this.disabled = true;
                 this.needsDraw = true;
             }
         }
@@ -169,6 +171,7 @@ exports.Splitter = Montage.create(Component, {
                 } else {
                     this.panel.addEventListener("webkitTransitionEnd", this, false);
                 }
+                this.disabled = false;
                 this.needsDraw = true;
             }
         }