diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less b/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less
index d2a3bdedb1..e81df77772 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less
@@ -1,6 +1,7 @@
 .umb-editors {
     .absolute();
     overflow: hidden;
+    z-index: 7500;
 
     .umb-editor {
         box-shadow: 0px 0 30px 0 rgba(0,0,0,.3);
@@ -104,4 +105,4 @@
     i {
         margin-right:5px;
      }
-}
\ 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 056d2b6f51..bd8d23a851 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
@@ -66,11 +66,7 @@
                 <section id="contentwrapper">
 
                     <div id="contentcolumn">
-
                         <div class="umb-editor" ng-view></div>
-                        <div class="umb-editor__overlay" ng-if="infiniteMode"></div>
-
-                        <umb-editors></umb-editors>
                     </div>
 
                 </section>
@@ -93,7 +89,7 @@
 
     </div>
 
-    <umb-backdrop ng-if="backdrop.show"
+    <umb-backdrop ng-if="backdrop.show || infiniteMode"
                   backdrop-opacity="backdrop.opacity"
                   highlight-element="backdrop.element"
                   highlight-prevent-click="backdrop.elementPreventClick"
@@ -107,6 +103,8 @@
                  parent-scope="overlay.parentScope">
     </umb-overlay>
 
+    <umb-editors ng-show="infiniteMode"></umb-editors>
+
     <umb-login
         ng-if="login.show"
         on-login="hideLoginScreen()">