diff --git a/core/js/dist/login.js b/core/js/dist/login.js
index 5ffe17797baee930cea800d8159e521951e1f59a..d6cc1025279b302ee87d3ec02a332cb7eaf14654 100644
Binary files a/core/js/dist/login.js and b/core/js/dist/login.js differ
diff --git a/core/js/dist/login.js.map b/core/js/dist/login.js.map
index c2d8d0a99dddea3f6f65a7624998099834be28e5..e09c328177fdcbc5f3408073e942f91150a07a8d 100644
Binary files a/core/js/dist/login.js.map and b/core/js/dist/login.js.map differ
diff --git a/core/js/dist/main.js b/core/js/dist/main.js
index 31e5afddd900c44a78b5dd18361afe173a399b64..da2189c5bc9d787337ceefa96649b8538c1cc273 100644
Binary files a/core/js/dist/main.js and b/core/js/dist/main.js differ
diff --git a/core/js/dist/main.js.map b/core/js/dist/main.js.map
index 2aad6888a04615e135a0c85d5e8d4357fd8c4647..75e062b9f825d6a5d57fee958214b007a8cf7998 100644
Binary files a/core/js/dist/main.js.map and b/core/js/dist/main.js.map differ
diff --git a/core/src/OC/dialogs.js b/core/src/OC/dialogs.js
index 380aeb3a76b982a91bc45b8ca15906ef70af39da..2c8ecc54e322db54feff7372ec4aba953eb4f8a2 100644
--- a/core/src/OC/dialogs.js
+++ b/core/src/OC/dialogs.js
@@ -107,7 +107,7 @@ const Dialogs = {
 			'none',
 			buttons,
 			callback,
-			modal
+			modal === undefined ? true : modal
 		)
 	},
 	/**
@@ -1245,7 +1245,7 @@ const Dialogs = {
 			dir: '',
 			name: '' // Ugly but works ;)
 		}, { escapeFunction: null }).prependTo(this.$dirTree)
-		
+
 	},
 	/**
 	 * handle selection made in the tree list
diff --git a/core/src/jquery/css/jquery.ocdialog.scss b/core/src/jquery/css/jquery.ocdialog.scss
index 89653ae181a04ac9764b284c464924d233a755f5..51efe3a00f8a1b3515d0f164f60cb8a9d7330224 100644
--- a/core/src/jquery/css/jquery.ocdialog.scss
+++ b/core/src/jquery/css/jquery.ocdialog.scss
@@ -72,6 +72,10 @@
 	height: 100%;
 }
 
+body.dark .oc-dialog-dim {
+	opacity: .8;
+}
+
 .oc-dialog-content {
 	width: 100%;
 	max-width: 550px;
diff --git a/core/src/jquery/ocdialog.js b/core/src/jquery/ocdialog.js
index 518a28f75d313537151bfde288c0161ec4c1767c..8c4a7602a78cfca4da140a8cc4c7111792c383a3 100644
--- a/core/src/jquery/ocdialog.js
+++ b/core/src/jquery/ocdialog.js
@@ -210,9 +210,14 @@ $.widget('oc.ocdialog', {
 		}
 
 		const self = this
+		let contentDiv = $('#content')
+		if (contentDiv.length === 0) {
+			// nextcloud-vue compatibility
+			contentDiv = $('.content')
+		}
 		this.overlay = $('<div>')
 			.addClass('oc-dialog-dim')
-			.appendTo($('#content'))
+			.appendTo(contentDiv)
 		this.overlay.on('click keydown keyup', function(event) {
 			if (event.target !== self.$dialog.get(0) && self.$dialog.find($(event.target)).length === 0) {
 				event.preventDefault()