diff --git a/laf b/laf
index ca7739de7..36abe0348 160000
--- a/laf
+++ b/laf
@@ -1 +1 @@
-Subproject commit ca7739de757ad098e28e33a5e0645b6852c1e929
+Subproject commit 36abe0348ccdb00ddbb854ca21e1ae9ce75752f4
diff --git a/src/app/ui/export_file_window.cpp b/src/app/ui/export_file_window.cpp
index b342d71e5..b17ec4c3b 100644
--- a/src/app/ui/export_file_window.cpp
+++ b/src/app/ui/export_file_window.cpp
@@ -192,8 +192,14 @@ void ExportFileWindow::setAniDir(const doc::AniDir aniDir)
 
 void ExportFileWindow::setOutputFilename(const std::string& pathAndFilename)
 {
-  m_outputPath = base::get_file_path(pathAndFilename);
-  m_outputFilename = base::get_file_name(pathAndFilename);
+  if (base::get_file_path(m_doc->filename()).empty()) {
+    m_outputPath = base::get_file_path(pathAndFilename);
+    m_outputFilename = base::get_file_name(pathAndFilename);
+  }
+  else {
+    m_outputPath = base::get_file_path(m_doc->filename());
+    m_outputFilename = base::get_relative_path(pathAndFilename, base::get_file_path(m_doc->filename()));
+  }
 
   updateOutputFilenameEntry();
 }