diff --git a/DiscordChatExporter.Gui/ViewModels/Dialogs/ExportSetupViewModel.cs b/DiscordChatExporter.Gui/ViewModels/Dialogs/ExportSetupViewModel.cs
index 6410e7a..5264b42 100644
--- a/DiscordChatExporter.Gui/ViewModels/Dialogs/ExportSetupViewModel.cs
+++ b/DiscordChatExporter.Gui/ViewModels/Dialogs/ExportSetupViewModel.cs
@@ -101,11 +101,15 @@ public class ExportSetupViewModel : DialogScreen
             var extension = SelectedFormat.GetFileExtension();
             var filter = $"{extension.ToUpperInvariant()} files|*.{extension}";
 
-            OutputPath = _dialogManager.PromptSaveFilePath(filter, defaultFileName);
+            var outputPath = _dialogManager.PromptSaveFilePath(filter, defaultFileName);
+            if (!string.IsNullOrWhiteSpace(outputPath))
+                OutputPath = outputPath;
         }
         else
         {
-            OutputPath = _dialogManager.PromptDirectoryPath();
+            var outputPath = _dialogManager.PromptDirectoryPath();
+            if (!string.IsNullOrWhiteSpace(outputPath))
+                OutputPath = outputPath;
         }
     }