diff --git a/admin/client/dist/js/bundle.js b/admin/client/dist/js/bundle.js
index 37c546809..74ead799d 100644
--- a/admin/client/dist/js/bundle.js
+++ b/admin/client/dist/js/bundle.js
@@ -2035,8 +2035,10 @@ e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,wri
 value:!0})
 var s=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n]
 i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}(),l=n(4),u=i(l),d=n(20),c=i(d),f=function(e){
-function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).apply(this,arguments))}return a(t,e),s(t,[{key:"render",value:function n(){return u["default"].createElement("div",{className:"app"
-},this.props.children)}}]),t}(c["default"])
+function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).apply(this,arguments))}return a(t,e),s(t,[{key:"render",value:function n(){var e=u["default"].Children.only(this.props.children)
+
+
+return e}}]),t}(c["default"])
 t["default"]=f},function(e,t){e.exports=ReactRouterRedux},function(e,t){e.exports=ReduxThunk},function(e,t){e.exports=ReducerRegister},function(e,t,n){"use strict"
 function i(e){return e&&e.__esModule?e:{"default":e}}function r(e){return{type:a["default"].SET_CONFIG,payload:{config:e}}}Object.defineProperty(t,"__esModule",{value:!0}),t.setConfig=r
 var o=n(151),a=i(o)},function(e,t){"use strict"
diff --git a/admin/client/dist/styles/bundle.css b/admin/client/dist/styles/bundle.css
index fda737482..5c9733cad 100644
--- a/admin/client/dist/styles/bundle.css
+++ b/admin/client/dist/styles/bundle.css
@@ -15998,12 +15998,9 @@ input.checkbox,input.radio,input[type=checkbox],input[type=radio]{
 
 body,html{
   width:100%;
+  height:100%;
   margin:0;
   padding:0;
-}
-
-.fill-height,body,html{
-  height:100%;
   display:-ms-flexbox;
   display:-webkit-box;
   display:flex;
@@ -16016,14 +16013,15 @@ body,html{
 }
 
 .fill-height,.fill-width{
+  height:100%;
+  display:-ms-flexbox;
+  display:-webkit-box;
+  display:flex;
   -webkit-box-direction:normal;
 }
 
 .fill-width{
   width:100%;
-  display:-ms-flexbox;
-  display:-webkit-box;
-  display:flex;
   -ms-flex-direction:row;
   -webkit-box-orient:horizontal;
           flex-direction:row;
diff --git a/admin/client/src/containers/App/App.js b/admin/client/src/containers/App/App.js
index cc09e487a..b111dbd4c 100644
--- a/admin/client/src/containers/App/App.js
+++ b/admin/client/src/containers/App/App.js
@@ -7,7 +7,9 @@ import SilverStripeComponent from 'lib/SilverStripeComponent';
  */
 class App extends SilverStripeComponent {
   render() {
-    return (<div className="app">{this.props.children}</div>);
+    // TODO re-add <div className="app"> wrapper when applying to document.body
+    const Child = React.Children.only(this.props.children);
+    return (Child);
   }
 }
 
diff --git a/admin/client/src/styles/_layout.scss b/admin/client/src/styles/_layout.scss
index fba68b040..2535a205d 100644
--- a/admin/client/src/styles/_layout.scss
+++ b/admin/client/src/styles/_layout.scss
@@ -168,6 +168,7 @@ html, body {
 // Nested items take up width
 .fill-width {
   width: 100%;
+  height: 100%;
   display: -ms-flexbox;
   display: flex;
   -ms-flex-direction: row;