diff --git a/svelte/src/file_viewer/FilePicker.svelte b/svelte/src/file_viewer/FilePicker.svelte
index 93cfdb3..186c848 100644
--- a/svelte/src/file_viewer/FilePicker.svelte
+++ b/svelte/src/file_viewer/FilePicker.svelte
@@ -55,7 +55,10 @@ const search = (e) => {
 }
 
 let done = () => {
-	dispatch("files", directory_element.getSelectedFiles())
+	let selected_files = directory_element.getSelectedFiles()
+	if (selected_files.length > 0) {
+		dispatch("files", selected_files)
+	}
 	modal.hide()
 }
 
diff --git a/svelte/src/file_viewer/GalleryView.svelte b/svelte/src/file_viewer/GalleryView.svelte
index 20b7a0d..96ce156 100644
--- a/svelte/src/file_viewer/GalleryView.svelte
+++ b/svelte/src/file_viewer/GalleryView.svelte
@@ -158,16 +158,19 @@ const drop = (e, index) => {
 			Add files
 		</div>
 	{/if}
-
-	<FilePicker bind:this={file_picker} on:files={e => {add_files(e.detail)}}></FilePicker>
 </div>
 
+<FilePicker bind:this={file_picker} on:files={e => {add_files(e.detail)}}></FilePicker>
+
 <style>
 .gallery{
 	padding: 16px;
 	width: 100%;
-	height: 100%;
+	max-height: 100%;
 	overflow: auto;
+	display: flex;
+	flex-wrap: wrap;
+	justify-content: center;
 }
 .file{
 	position: relative;