1 files changed, 16 insertions, 5 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();