diff --git a/core/src/net/sf/openrocket/gui/preset/ComponentPresetEditor.java b/core/src/net/sf/openrocket/gui/preset/ComponentPresetEditor.java
index 9b8928cc1..fb95c4fcd 100644
--- a/core/src/net/sf/openrocket/gui/preset/ComponentPresetEditor.java
+++ b/core/src/net/sf/openrocket/gui/preset/ComponentPresetEditor.java
@@ -333,7 +333,7 @@ public class ComponentPresetEditor extends JPanel implements PresetResultListene
             chooser.setCurrentDirectory(editContext.getLastDirectory());
         }
         else {
-            chooser.setCurrentDirectory(((SwingPreferences) Application.getPreferences()).getDefaultDirectory());
+            chooser.setCurrentDirectory(((SwingPreferences) Application.getPreferences()).getDefaultUserComponentDirectory());
         }
 
         int option = chooser.showOpenDialog(ComponentPresetEditor.this);
@@ -414,7 +414,7 @@ public class ComponentPresetEditor extends JPanel implements PresetResultListene
             chooser.setSelectedFile(editContext.getOpenedFile());
         }
         else {
-            chooser.setCurrentDirectory(((SwingPreferences) Application.getPreferences()).getDefaultDirectory());
+            chooser.setCurrentDirectory(((SwingPreferences) Application.getPreferences()).getDefaultUserComponentDirectory());
         }
 
         int option = chooser.showSaveDialog(ComponentPresetEditor.this);