diff --git a/src/Umbraco.Web.UI.Client/gulpfile.js b/src/Umbraco.Web.UI.Client/gulpfile.js
index 30ef9c749f..089f55f9bf 100644
--- a/src/Umbraco.Web.UI.Client/gulpfile.js
+++ b/src/Umbraco.Web.UI.Client/gulpfile.js
@@ -41,7 +41,7 @@ function processLess(files, out) {
 
     var processors = [
          autoprefixer,
-         cssnano
+         cssnano({zindex: false}),
     ];
 
     return gulp.src(files)
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/overlays.less b/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
index 0a8dfe6f71..68d3b20cab 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
@@ -2,7 +2,7 @@
     position: fixed;
     overflow: hidden;
     background: @white;
-    z-index: 996660;
+    z-index: 7500;
     animation: fadeIn 0.2s;
     box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23);
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-lightbox.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-lightbox.less
index fb2cc036f4..6fe68ff490 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-lightbox.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-lightbox.less
@@ -6,7 +6,7 @@
     left: 0;
     width: 100%;
     height: 100%;
-    z-index: 999;
+    z-index: 5000;
     display: flex;
     align-items: center;
     justify-content: center;