diff --git a/src/Umbraco.Web.UI.Client/src/less/application/grid.less b/src/Umbraco.Web.UI.Client/src/less/application/grid.less
index 0fe4497bd5..ae20cc2ed8 100644
--- a/src/Umbraco.Web.UI.Client/src/less/application/grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/application/grid.less
@@ -62,10 +62,6 @@ body.umb-drawer-is-visible #mainwrapper{
   margin: 0
 }
 
-#contentwrapper {
-    top: @appHeaderHeight;
-}
-
 #umb-notifications-wrapper {
     left: 80px;
 }
@@ -87,7 +83,7 @@ body.umb-drawer-is-visible #mainwrapper{
   z-index: 1100;
   float: left;
   position: absolute;
-  top: @appHeaderHeight;
+  top: 0;
 }
 
 #navigation {
@@ -98,17 +94,16 @@ body.umb-drawer-is-visible #mainwrapper{
   z-index: 100;
   background: @white;
   height: 100%;
-
 }
 
-.navigation-inner-container{
-    position: absolute;
-    top: 0px;
-    bottom: 0px;
-    left: 0px;
-    right: 0px;
-    border-right: 1px solid @gray-9;
-    z-index: 100;
+.navigation-inner-container {
+  position: absolute;
+  top: 0px;
+  bottom: 0px;
+  left: 0px;
+  right: 0px;
+  border-right: 1px solid @gray-9;
+  z-index: 100;
 }
 
 #dialog {
@@ -124,6 +119,7 @@ body.umb-drawer-is-visible #mainwrapper{
   padding: 0px;
   z-index: 100 !important;
   overflow: auto;
+  height: 100%;
 }
 
 #tree .umb-tree {
diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less
index 12cddd5aa2..b523e507bc 100644
--- a/src/Umbraco.Web.UI.Client/src/less/belle.less
+++ b/src/Umbraco.Web.UI.Client/src/less/belle.less
@@ -82,6 +82,7 @@
 
 // Umbraco Components
 @import "components/application/umb-app-header.less";
+@import "components/application/umb-app-content.less";
 @import "components/application/umb-tour.less";
 @import "components/application/umb-backdrop.less";
 @import "components/application/umb-drawer.less";
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-app-content.less b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-app-content.less
new file mode 100644
index 0000000000..b3e0015d9a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-app-content.less
@@ -0,0 +1,7 @@
+.umb-app-content {
+    position: absolute;
+    top: @appHeaderHeight;
+    right: 0;
+    bottom: 0;
+    left: 0;
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
index 14d481d3dc..66fc2bd1ff 100644
--- a/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
+++ b/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
@@ -60,11 +60,15 @@
 
             <umb-app-header></umb-app-header>
 
-            <umb-navigation></umb-navigation>
+            <div class="umb-app-content">
 
-            <section id="contentwrapper">
-                <div id="contentcolumn" ng-view></div>
-            </section>
+                <umb-navigation></umb-navigation>
+
+                <section id="contentwrapper">
+                    <div id="contentcolumn" ng-view></div>
+                </section>
+                
+            </div>
 
             <umb-tour
                 ng-if="tour.show"