1 files changed, 3 insertions, 3 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 588481bb..5020e27d 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -68,7 +68,7 @@ exports.DocumentController = Montage.create(Component, {
                 return;
             }
 
-            if(this._currentDocument) {
+            if(this._currentDocument && this._currentDocument.model.currentView) {
                 this._currentDocument.model.currentView.hide();
             }
 
@@ -80,12 +80,12 @@ exports.DocumentController = Montage.create(Component, {
             } else if(this._currentDocument.currentView === "design") {
                 document.getElementById("codeViewContainer").style.display = "none";
                 document.getElementById("iframeContainer").style.display = "block";
-                this._currentDocument.model.currentView.show();
+                if (this._currentDocument.model.currentView) this._currentDocument.model.currentView.show();
                 this._currentDocument.model.views.design._liveNodeList = this._currentDocument.model.documentRoot.getElementsByTagName('*');
             } else {
                 document.getElementById("iframeContainer").style.display = "none";
                 this._currentDocument.model.parentContainer.style["display"] = "block";
-                this._currentDocument.model.currentView.show();
+                if (this._currentDocument.model.currentView) this._currentDocument.model.currentView.show();
             }
 
         }