2 files changed, 10 insertions, 5 deletions

diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js
index 0f2a16e0..184c4899 100755
--- a/js/controllers/selection-controller.js
+++ b/js/controllers/selection-controller.js
@@ -92,12 +92,14 @@ exports.SelectionController = Montage.create(Component, {
     handleSwitchDocument: {
         value: function() {
             this._selectedItems = this.application.ninja.selectedElements.slice(0);
-            if(this._selectedItems.length === 0){
+            if(this._selectedItems.length === 0 ){
                 this._isDocument = true;
             }else{
                 this._isDocument = false;
             }
             NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument} );
+
+            this._selectionContainer = this.application.ninja.currentSelectedContainer;
         }
     },
 
diff --git a/js/document/html-document.js b/js/document/html-document.js
index aac03606..9e3f0cdd 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -717,9 +717,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
             this.application.ninja.stage.drawUtils.gridHorizontalSpacing = this.gridHorizontalSpacing;
             this.application.ninja.stage.drawUtils.gridVerticalSpacing = this.gridVerticalSpacing;
 
-            if((typeof this.selectionModel !== 'undefined') && (this.selectionModel !== null)){
-                this.application.ninja.selectedElements = this.selectionModel.slice(0);
-            }
+
 
             if((this.savedLeftScroll!== null) && (this.savedTopScroll !== null)){
                 this.application.ninja.stage._iframeContainer.scrollLeft = this.savedLeftScroll;
@@ -727,12 +725,17 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                 this.application.ninja.stage._iframeContainer.scrollTop = this.savedTopScroll;
                 this.application.ninja.stage._scrollLeft = this.savedTopScroll;
             }
-            this.application.ninja.stage.handleScroll();
+
+            if((typeof this.selectionModel !== 'undefined') && (this.selectionModel !== null)){
+                this.application.ninja.selectedElements = this.selectionModel.slice(0);
+            }
 
             this.application.ninja.appModel.show3dGrid = this.draw3DGrid;
 
             this.application.ninja.undocontroller.undoQueue = this.undoStack.slice(0);
             this.application.ninja.undocontroller.redoQueue = this.redoStack.slice(0);
+
+            this.application.ninja.currentSelectedContainer = this.documentRoot;
         }
     }
         ////////////////////////////////////////////////////////////////////