3 files changed, 4 insertions, 3 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index e059e7e1..13ab33cc 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -53,10 +53,9 @@ exports.DocumentController = Montage.create(Component, {
                 document.getElementById("iframeContainer").style.display = "block";
                 document.getElementById("codeViewContainer").style.display = "block";
             } else if(this._currentDocument.currentView === "design") {
-                this._currentDocument.model.currentView.show();
+
             } else {
                 document.getElementById("iframeContainer").style.display = "none";
-                this._currentDocument.model.currentView.show();
             }
 
         }
diff --git a/js/document/document-html.js b/js/document/document-html.js
index c60a12a2..377c305a 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -99,6 +99,8 @@ exports.HtmlDocument = Montage.create(Component, {
                 //Removing observer, only needed on initial load
                 this._observer.disconnect();
                 this._observer = null;
+            //Show the view
+            this.model.currentView.show();
                 //Making callback after view is loaded
             this.loaded.callback.call(this.loaded.context, this);
         }
diff --git a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js
index 49907c9d..104d474d 100755
--- a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js
+++ b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js
@@ -213,7 +213,7 @@ exports.ThreeD = Montage.create(Component, {
 
             this._currentDocument = value;
 
-            if(this._currentDocument.currentView === "design") {
+            if(this._currentDocument && this._currentDocument.currentView === "design") {
                 // Save a reference of the pi inside the document view to be able to clear
                 Object.defineBinding(this, "item", {
                     boundObject: this,