diff --git a/lib/components/DialogBase.vue b/lib/components/DialogBase.vue
index e014443b..128f6975 100644
--- a/lib/components/DialogBase.vue
+++ b/lib/components/DialogBase.vue
@@ -76,12 +76,12 @@ const props = withDefaults(defineProps<{
 	 * </style>
 	 * ```
 	 */
-	navigationClasses?: string[]
+	navigationClasses?: string|Record<string, boolean>|(string|Record<string, boolean>)[]
 	/**
 	 * Optionally pass additionaly classes which will be set on the content wrapper for custom styling
 	 * @default []
 	 */
-	contentClasses?: string[]
+	contentClasses?: string|Record<string, boolean>|(string|Record<string, boolean>)[]
 	/**
 	 * Optionally pass additionaly classes which will be set on the dialog itself
 	 * (the default `class` attribute will be set on the modal wrapper)
diff --git a/lib/components/FilePicker/FilePicker.vue b/lib/components/FilePicker/FilePicker.vue
index 1dd27f6e..f5f38c2c 100644
--- a/lib/components/FilePicker/FilePicker.vue
+++ b/lib/components/FilePicker/FilePicker.vue
@@ -1,5 +1,12 @@
 <template>
-	<DialogBase v-bind="dialogProps" @close="emit('close')">
+	<DialogBase :container="container"
+		:name="name"
+		:buttons="dialogButtons"
+		size="large"
+		content-classes="file-picker__content"
+		dialog-classes="file-picker"
+		navigation-classes="file-picker__navigation"
+		@close="handleClose">
 		<template #navigation="{ isCollapsed }">
 			<FilePickerNavigation :is-collapsed="isCollapsed" :current-view.sync="currentView" :filter-string.sync="filterString" />
 		</template>
@@ -44,7 +51,7 @@
 </template>
 
 <script setup lang="ts">
-import type { IFilePickerButton, IFilePickerButtonFactory, IFilePickerFilter } from '../types'
+import type { IDialogButton, IFilePickerButton, IFilePickerButtonFactory, IFilePickerFilter } from '../types'
 import type { Node } from '@nextcloud/files'
 
 import IconFile from 'vue-material-design-icons/File.vue'
@@ -122,19 +129,6 @@ const emit = defineEmits<{
  */
 const { isPublic } = useIsPublic()
 
-/**
- * Props to be passed to the underlying Dialog component
- */
-const dialogProps = computed(() => ({
-	container: props.container,
-	name: props.name,
-	buttons: dialogButtons.value,
-	size: 'large',
-	contentClasses: ['file-picker__content'],
-	dialogClasses: ['file-picker'],
-	navigationClasses: ['file-picker__navigation'],
-}))
-
 /**
  * Map buttons to Dialog buttons by wrapping the callback function to pass the selected files
  */
@@ -146,13 +140,36 @@ const dialogButtons = computed(() => {
 	return buttons.map((button) => ({
 		...button,
 		callback: async () => {
-			const nodes = selectedFiles.value.length === 0 && props.allowPickDirectory ? [await getFile(currentPath.value)] : selectedFiles.value as Node[]
-			button.callback(nodes)
-			emit('close', selectedFiles.value as Node[])
+			isHandlingCallback = true
+			handleButtonClick(button.callback)
 		},
-	} as IFilePickerButton))
+	} as IDialogButton))
 })
 
+/**
+ * Flag that is set when a button was clicked to prevent the default close event to be emitted
+ * This is needed as `handleButtonClick` is async and thus might execute after NcDialog already closed
+ */
+let isHandlingCallback = false
+
+const handleButtonClick = async (callback: IFilePickerButton['callback']) => {
+	const nodes = selectedFiles.value.length === 0 && props.allowPickDirectory ? [await getFile(currentPath.value)] : selectedFiles.value as Node[]
+	callback(nodes)
+	emit('close', nodes)
+	// Unlock close
+	isHandlingCallback = false
+}
+
+/**
+ * Handle closing of the dialog
+ * Do not emit close event on button press as this is handled by `handleButtonClick`
+ */
+const handleClose = () => {
+	if (!isHandlingCallback) {
+		emit('close')
+	}
+}
+
 /**
  * Name of the currently active view
  */
@@ -225,7 +242,7 @@ const filteredFiles = computed(() => {
 		filtered = filtered.filter((file) => file.basename.toLowerCase().includes(filterString.value.toLowerCase()))
 	}
 	if (props.filterFn) {
-		filtered = filtered.filter((f) => props.filterFn(f as Node))
+		filtered = filtered.filter((f) => props.filterFn!(f as Node))
 	}
 	return filtered
 })
diff --git a/lib/usables/dav.ts b/lib/usables/dav.ts
index ff220875..de686a81 100644
--- a/lib/usables/dav.ts
+++ b/lib/usables/dav.ts
@@ -124,6 +124,7 @@ export const useDAVFiles = function(
 
 		const { data } = await client.value.stat(`${rootPath}${path}`, {
 			details: true,
+			data: davGetDefaultPropfind(),
 		}) as ResponseDataDetailed<FileStat>
 		return resultToNode(data)
 	}