diff --git a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/project/ProjectExportDialog.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/project/ProjectExportDialog.java
index 15212f59ccb7aac5218b85752f47b1a44496c4c2..2bb7eb49594abb3139977c69b9fdbf365cec57c1 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/project/ProjectExportDialog.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/project/ProjectExportDialog.java
@@ -54,6 +54,7 @@ public class ProjectExportDialog extends NVC implements ProjectExporterDelegate
 
 		NVCStage nvcStage = applyViewControllerToStage();
 		nvcStage.initOwner(owner);
+		addCloseKeyShortcut(nvcStage::close);
 
 		busyView = new BusyView(this);
 	}
@@ -83,6 +84,7 @@ public class ProjectExportDialog extends NVC implements ProjectExporterDelegate
 		String extensionName = Localization.getString(Strings.FILE_FILTER_ZIP);
 		ExtensionFilter extensionFilter = new ExtensionFilter(extensionName, PlayPadMain.ZIP_TYPE);
 		chooser.getExtensionFilters().add(extensionFilter);
+		chooser.setInitialFileName(String.format("%s.zip", projectRef.getName()));
 
 		File file = chooser.showSaveDialog(getContainingWindow());
 		if (file != null) {