diff --git a/lib/components/DialogBase.vue b/lib/components/DialogBase.vue
index ddc853b3..1fb111f4 100644
--- a/lib/components/DialogBase.vue
+++ b/lib/components/DialogBase.vue
@@ -5,14 +5,14 @@
 		@close="handleClose">
 		<!-- The dialog name / header -->
 		<h2 class="dialog__name" v-text="name" />
-		<div class="dialog">
+		<div class="dialog" :class="dialogClasses">
 			<div ref="wrapper" :class="['dialog__wrapper', { 'dialog__wrapper--collapsed': isNavigationCollapsed }]">
 				<!-- When the navigation is collapsed (too small dialog) it is displayed above the main content, otherwise on the inline start -->
-				<nav v-if="hasNavigation" :class="['dialog__navigation', ...navigationClasses]">
+				<nav v-if="hasNavigation" class="dialog__navigation" :class="navigationClasses">
 					<slot name="navigation" :is-collapsed="isNavigationCollapsed" />
 				</nav>
 				<!-- Main dialog content -->
-				<div :class="['dialog__content', ...contentClasses]">
+				<div class="dialog__content" :class="contentClasses">
 					<slot>
 						<p>{{ props.message }}</p>
 					</slot>
@@ -32,10 +32,13 @@
 </template>
 
 <script setup lang="ts">
+import type { IDialogButton } from './types'
+
 import { NcModal } from '@nextcloud/vue'
-import { computed, ref, useSlots } from 'vue'
-import DialogButton, { type IDialogButton } from './DialogButton.vue'
 import { useElementSize } from '@vueuse/core'
+import { computed, ref, useSlots } from 'vue'
+
+import DialogButton from './DialogButton.vue'
 
 const props = withDefaults(defineProps<{
 	/** Name of the dialog (the heading) */
@@ -79,12 +82,18 @@ const props = withDefaults(defineProps<{
 	 * @default []
 	 */
 	contentClasses?: string[]
+	/**
+	 * Optionally pass additionaly classes which will be set on the dialog itself
+	 * (the default `class` attribute will be set on the modal wrapper)
+	 */
+	dialogClasses?: string|Record<string, boolean>|(string|Record<string, boolean>)[]
 }>(), {
 	additionalTrapElements: () => [],
 	buttons: () => [],
 	container: undefined,
 	message: '',
 	contentClasses: () => [],
+	dialogClasses: () => [],
 	navigationClasses: () => [],
 	size: 'small',
 })
diff --git a/lib/components/FilePicker/FileList.vue b/lib/components/FilePicker/FileList.vue
index cb75ea27..2758933e 100644
--- a/lib/components/FilePicker/FileList.vue
+++ b/lib/components/FilePicker/FileList.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="file-picker__files">
+	<div class="file-picker__files" ref="fileContainer">
 		<table>
 			<thead>
 				<tr>
@@ -51,7 +51,7 @@
 			</thead>
 			<tbody>
 				<template v-if="loading">
-					<LoadingTableRow v-for="i in [1, 2, 3, 4]" :key="i" :show-checkbox="multiselect"/>
+					<LoadingTableRow v-for="index in skeletonNumber" :key="index" :show-checkbox="multiselect"/>
 				</template>
 				<template v-else>
 					<FileListRow v-for="file in sortedFiles"
@@ -76,7 +76,7 @@ import { getCanonicalLocale } from '@nextcloud/l10n'
 import { NcButton, NcCheckboxRadioSwitch } from '@nextcloud/vue'
 import { join } from 'path'
 import { t } from '../../utils/l10n'
-import { computed, ref, type Ref } from 'vue'
+import { computed, nextTick, onMounted, onUnmounted, ref, type Ref } from 'vue'
 
 import IconSortAscending from 'vue-material-design-icons/MenuDown.vue'
 import IconSortDescending from 'vue-material-design-icons/MenuUp.vue'
@@ -184,15 +184,40 @@ function onNodeSelected(file: Node) {
 function onChangeDirectory(dir: Node) {
 	emit('update:path', join(props.path, dir.basename))
 }
+
+/**
+ * Number of loading skeletons to use to fill the filepicker
+ */
+const skeletonNumber = ref(4)
+const fileContainer = ref<HTMLDivElement>()
+{
+	const resize = () => nextTick(() => {
+		const nodes = fileContainer.value?.parentElement?.children || []
+		let height = fileContainer.value?.parentElement?.clientHeight || 450
+		for(let index = 0; index < nodes.length; index++) {
+			if (!fileContainer.value?.isSameNode(nodes[index])) {
+				height -= nodes[index].clientHeight
+			}
+		}
+		// container height - 50px table header / row height of 50px
+		skeletonNumber.value = Math.floor((height - 50) / 50)
+	})
+	onMounted(() => {
+		window.addEventListener('resize', resize)
+		resize()
+	})
+	onUnmounted(() => {
+		window.removeEventListener('resize', resize)
+	})
+}
 </script>
 
 <style scoped lang="scss">
 .file-picker {
 	&__files {
 		// ensure focus outlines are visible
-		padding: 2px;
-		padding-inline-start: 12px; // align with bread crumbs
-		min-height: calc(5 * var(--row-height, 50px)); // make file list not jumping when loading (1x header 4x loading placeholders)
+		margin: 2px;
+		margin-inline-start: 12px; // align with bread crumbs
 		overflow: scroll auto;
 
 		table {
diff --git a/lib/components/FilePicker/FilePicker.vue b/lib/components/FilePicker/FilePicker.vue
index 0856aa3b..10932748 100644
--- a/lib/components/FilePicker/FilePicker.vue
+++ b/lib/components/FilePicker/FilePicker.vue
@@ -126,8 +126,9 @@ const dialogProps = computed(() => ({
 	name: props.name,
 	buttons: dialogButtons.value,
 	size: 'large',
-	navigationClasses: ['file-picker__navigation'],
 	contentClasses: ['file-picker__content'],
+	dialogClasses: ['file-picker'],
+	navigationClasses: ['file-picker__navigation'],
 }))
 
 /**
@@ -258,11 +259,6 @@ export default {
 
 <style scoped lang="scss">
 .file-picker {
-	display: flex;
-	flex-direction: row;
-	min-height: 40vh;
-	gap: 22px;
-
 	&__view {
 		height: 50px; // align with breadcrumbs
 		display: flex;
@@ -291,8 +287,21 @@ export default {
 	}
 }
 
+:deep(.file-picker) {
+	// Dialog is max. 900px wide so the best looking height seems to be 800px
+	height: min(80vh, 800px);
+}
+
+@media (max-width: 512px) {
+	:deep(.file-picker) {
+		// below 512px the modal is fullscreen so we use 100% height - margin of heading (4px + 12px) - height of heading (default-clickable-area)
+		height: calc(100% - 16px - var(--default-clickable-area));
+	}
+}
+
 :deep(.file-picker__content) {
 	display: flex;
 	flex-direction: column;
+	overflow: hidden;
 }
 </style>
diff --git a/lib/components/FilePicker/FilePickerNavigation.vue b/lib/components/FilePicker/FilePickerNavigation.vue
index 888b3a81..6e237c30 100644
--- a/lib/components/FilePicker/FilePickerNavigation.vue
+++ b/lib/components/FilePicker/FilePickerNavigation.vue
@@ -101,6 +101,8 @@ const updateFilterValue = (value: string) => emit('update:filterString', value)
 		min-width: 200px;
 		// ensure focus outline is visible
 		padding-block: 2px;
+		// make only the navigation scroll
+		overflow: auto;
 
 		:deep(.button-vue__wrapper) {
 			justify-content: start;