diff --git a/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/listener/PadNewContentListener.java b/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/listener/PadNewContentListener.java
index fedd12aea0879dbda04f8cc41b28c335c4807a8e..9e3d7ac52f44875f46f9e2bb8c12c0e1cf5cb991 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/listener/PadNewContentListener.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/listener/PadNewContentListener.java
@@ -52,7 +52,8 @@ public class PadNewContentListener {
 		if (multiSelect) {
 			selectedFiles = chooser.showOpenMultipleDialog(window);
 		} else {
-			selectedFiles = Collections.singletonList(chooser.showOpenDialog(window));
+			final File selectedFile = chooser.showOpenDialog(window);
+			selectedFiles = selectedFile == null ? Collections.emptyList() : Collections.singletonList(selectedFile);
 		}
 
 		if (selectedFiles != null && !selectedFiles.isEmpty()) {