1 files changed, 11 insertions, 4 deletions

diff --git a/node_modules/montage/ui/loader.reel/loader.js b/node_modules/montage/ui/loader.reel/loader.js
index 921c3781..2ff0e42c 100755
--- a/node_modules/montage/ui/loader.reel/loader.js
+++ b/node_modules/montage/ui/loader.reel/loader.js
@@ -222,7 +222,9 @@ exports.Loader = Montage.create(Component, /** @lends module:montage/ui/loader.L
                 logger.debug(this, "templateDidLoad");
             }
 
-            this.element = document.documentElement;
+            if (!this.element) {
+                this.element = document.documentElement;
+            }
             this.readyToShowLoader = true;
 
             var timing = document._montageTiming,
@@ -348,7 +350,8 @@ exports.Loader = Montage.create(Component, /** @lends module:montage/ui/loader.L
 
     childComponentWillPrepareForDraw: {
         value: function(child) {
-            var self = this;
+            var self = this,
+                insertionElement;
 
             // if the mainComponent is ready to draw...
             if (child === this._mainComponent) {
@@ -360,11 +363,15 @@ exports.Loader = Montage.create(Component, /** @lends module:montage/ui/loader.L
 
                 // Determine old content
                 this._contentToRemove = document.createRange();
-                this._contentToRemove.selectNodeContents(document.body);
+
+                // If installing classnames on the documentElement (to affect as high a level as possible)
+                // make sure content only ends up inside the body
+                insertionElement = this.element === document.documentElement ? document.body : this.element;
+                this._contentToRemove.selectNodeContents(insertionElement);
 
                 // Add new content so mainComponent can actually draw
                 this.childComponents = [this._mainComponent];
-                document.body.appendChild(this._mainComponent.element);
+                insertionElement.appendChild(this._mainComponent.element);
 
                 var startBootstrappingTimeout = document[bootstrappingTimeoutPropertyName],
                     timing = document._montageTiming,