diff --git a/game-app/game-headed/src/main/java/games/strategy/triplea/ui/menubar/ExportMenu.java b/game-app/game-headed/src/main/java/games/strategy/triplea/ui/menubar/ExportMenu.java
index 2cbd28c7a55..df377c38a6a 100644
--- a/game-app/game-headed/src/main/java/games/strategy/triplea/ui/menubar/ExportMenu.java
+++ b/game-app/game-headed/src/main/java/games/strategy/triplea/ui/menubar/ExportMenu.java
@@ -1,6 +1,9 @@
 package games.strategy.triplea.ui.menubar;
 
+import static games.strategy.engine.ClientFileSystemHelper.getUserRootFolder;
+
 import com.google.common.collect.Iterables;
+import games.strategy.engine.ClientFileSystemHelper;
 import games.strategy.engine.data.GameData;
 import games.strategy.engine.data.GamePlayer;
 import games.strategy.engine.data.ProductionRule;
@@ -92,7 +95,6 @@ private JMenuItem createExportXmlMenu() {
   private void exportXmlFile() {
     final JFileChooser chooser = new JFileChooser();
     chooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
-    final Path rootDir = Path.of(SystemProperties.getUserDir());
 
     final int round = gameData.getCurrentRound();
     final String defaultFileName =
@@ -103,6 +105,7 @@ private void exportXmlFile() {
                     gameData.getGameName(),
                     round))
             + ".xml";
+    final Path rootDir = ClientFileSystemHelper.getUserRootFolder();
     chooser.setSelectedFile(rootDir.resolve(defaultFileName).toFile());
     if (chooser.showSaveDialog(frame) != JOptionPane.OK_OPTION) {
       return;