diff --git a/core/src/jquery/css/jquery.ocdialog.scss b/core/src/jquery/css/jquery.ocdialog.scss
index 1911dd29dc48a..6fba1a78d4025 100644
--- a/core/src/jquery/css/jquery.ocdialog.scss
+++ b/core/src/jquery/css/jquery.ocdialog.scss
@@ -4,7 +4,7 @@
 	border-radius: var(--border-radius-large);
 	box-shadow: 0 0 30px var(--color-box-shadow);
 	padding: 24px;
-	z-index: 10000;
+	z-index: 100001;
 	font-size: 100%;
 	box-sizing: border-box;
 	min-width: 200px;
@@ -69,7 +69,7 @@
 .oc-dialog-dim {
 	background-color: #000;
 	opacity: .2;
-	z-index: 9999;
+	z-index: 100001;
 	position: fixed;
 	top: 0;
 	left: 0;
diff --git a/core/src/jquery/ocdialog.js b/core/src/jquery/ocdialog.js
index 2d547443be9d8..75cfdc3ad0525 100644
--- a/core/src/jquery/ocdialog.js
+++ b/core/src/jquery/ocdialog.js
@@ -234,7 +234,7 @@ $.widget('oc.ocdialog', {
 		}
 		this.overlay = $('<div>')
 			.addClass('oc-dialog-dim')
-			.appendTo(contentDiv)
+			.insertBefore(this.$dialog)
 		this.overlay.on('click keydown keyup', function(event) {
 			if (event.target !== self.$dialog.get(0) && self.$dialog.find($(event.target)).length === 0) {
 				event.preventDefault()