diff --git a/app/src/main/java/com/annimon/hotarufx/io/FileManager.java b/app/src/main/java/com/annimon/hotarufx/io/FileManager.java
index c0f956e..e743c98 100644
--- a/app/src/main/java/com/annimon/hotarufx/io/FileManager.java
+++ b/app/src/main/java/com/annimon/hotarufx/io/FileManager.java
@@ -76,6 +76,9 @@ public class FileManager implements DocumentManager {
         fileChooser.setTitle(FILE_SAVE_TITLE);
         if (currentFile != null) {
             fileChooser.setInitialDirectory(currentFile.getParentFile());
+            fileChooser.setInitialFileName(currentFile.getName());
+        } else {
+            fileChooser.setInitialFileName("animation.hfx");
         }
         val newFile = fileChooser.showSaveDialog(stage);
         if (newFile == null) {