1 files changed, 11 insertions, 1 deletions

diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index 4c1efff4..e9e1e31c 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -318,9 +318,19 @@ exports.Ninja = Montage.create(Component, {
 
     closeFile: {
         value: function(document) {
-            var doc = this.documentList.content[this.documentList.content.indexOf(document)];
+            var doc = this.documentList.content[this.documentList.content.indexOf(document)], activeDocument;
+
+            if(this.documentList.selectedObjects[0] === doc) {
+                activeDocument = this.documentList.content[0];
+            } else {
+                activeDocument = this.documentList.selectedObjects[0];
+            }
 
             this.documentList.removeObjects(doc);
+
+            if(this.documentList.content.length) {
+                this.documentList.selectedObjects = [activeDocument];
+            }
         }
     },