diff --git a/client/src/main/java/ctbrec/ui/controls/DirectorySelectionBox.java b/client/src/main/java/ctbrec/ui/controls/DirectorySelectionBox.java
index dff40dd8..f8f89640 100644
--- a/client/src/main/java/ctbrec/ui/controls/DirectorySelectionBox.java
+++ b/client/src/main/java/ctbrec/ui/controls/DirectorySelectionBox.java
@@ -1,6 +1,7 @@
 package ctbrec.ui.controls;
 
 import java.io.File;
+import java.util.Optional;
 
 import javafx.stage.DirectoryChooser;
 
@@ -12,7 +13,8 @@ public class DirectorySelectionBox extends AbstractFileSelectionBox {
     @Override
     protected void choose() {
         DirectoryChooser chooser = new DirectoryChooser();
-        File currentDir = new File(fileProperty().get());
+        String preselection = Optional.ofNullable(fileProperty().get()).orElse(".");
+        File currentDir = new File(preselection);
         if (currentDir.exists() && currentDir.isDirectory()) {
             chooser.setInitialDirectory(currentDir);
         }