diff --git a/lib/view/pages/files/files.dart b/lib/view/pages/files/files.dart
index 3402bba..00b6719 100644
--- a/lib/view/pages/files/files.dart
+++ b/lib/view/pages/files/files.dart
@@ -105,7 +105,7 @@ class _FilesState extends State<Files> {
     pushScreen(
       context,
       withNavBar: false,
-      screen: FilesUploadDialog(filePaths: paths, remotePath: widget.path.join('/'), onUploadFinished: (uploadedFilePaths) => _query),
+      screen: FilesUploadDialog(filePaths: paths, remotePath: widget.path.join('/'), onUploadFinished: (uploadedFilePaths) => _query()),
     );
 
     return;
diff --git a/lib/view/pages/files/filesUploadDialog.dart b/lib/view/pages/files/filesUploadDialog.dart
index 8e19d8a..c90b5b0 100644
--- a/lib/view/pages/files/filesUploadDialog.dart
+++ b/lib/view/pages/files/filesUploadDialog.dart
@@ -108,11 +108,14 @@ class _FilesUploadDialogState extends State<FilesUploadDialog> {
                     '(Datei ${_uploadableFiles.indexOf(conflictingFiles.first)+1})',
                 textAlign: TextAlign.left,
               ) :
-              Text(
-                '${conflictingFiles.length} Dateien mit den Namen ${conflictingFiles.map((e) => e.fileName).toList()} existieren bereits.\n'
-                    '(Dateien ${conflictingFiles.map((e) => _uploadableFiles.indexOf(e)+1).toList()})',
-                textAlign: TextAlign.left,
+              SingleChildScrollView(
+                child: Text(
+                  '${conflictingFiles.length} Dateien mit den Namen: ${conflictingFiles.map((e) => '\n${e.fileName}').join(', ')}\n existieren bereits.\n'
+                      '(Dateien ${conflictingFiles.map((e) => _uploadableFiles.indexOf(e)+1).join(', ')})',
+                  textAlign: TextAlign.left,
+                ),
               ),
+
               actions: [
                 TextButton(
                   onPressed: () {
@@ -126,8 +129,8 @@ class _FilesUploadDialogState extends State<FilesUploadDialog> {
                       context: context,
                       builder: (context) {
                         return ConfirmDialog(
-                          title: 'Bist du sicher?',
-                          content: '',
+                          title: 'Bestätigen',
+                          content: 'Bist du sicher, dass du ${conflictingFiles.map((e) => e.fileName).toList()} überschreiben möchtest?',
                           onConfirm: () {
                             Navigator.pop(context, true);
                           },