diff --git a/app/src/main/java/io/xpipe/app/browser/OpenFileSystemModel.java b/app/src/main/java/io/xpipe/app/browser/OpenFileSystemModel.java
index 1c381e6c..d3e6700b 100644
--- a/app/src/main/java/io/xpipe/app/browser/OpenFileSystemModel.java
+++ b/app/src/main/java/io/xpipe/app/browser/OpenFileSystemModel.java
@@ -269,7 +269,7 @@ public final class OpenFileSystemModel {
     }
 
     public void createDirectoryAsync(String name) {
-        if (name.isBlank()) {
+        if (name == null || name.isBlank()) {
             return;
         }
 
diff --git a/app/src/main/java/io/xpipe/app/comp/base/ModalOverlayComp.java b/app/src/main/java/io/xpipe/app/comp/base/ModalOverlayComp.java
index 43bc0363..1c28f9bb 100644
--- a/app/src/main/java/io/xpipe/app/comp/base/ModalOverlayComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/base/ModalOverlayComp.java
@@ -7,12 +7,15 @@ import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.fxcomps.Comp;
 import io.xpipe.app.fxcomps.SimpleComp;
 import io.xpipe.app.fxcomps.util.PlatformThread;
+import io.xpipe.app.fxcomps.util.Shortcuts;
 import javafx.application.Platform;
 import javafx.beans.property.Property;
 import javafx.geometry.Insets;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonBar;
 import javafx.scene.control.Label;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyCodeCombination;
 import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
@@ -59,6 +62,7 @@ public class ModalOverlayComp extends SimpleComp {
 
                 if (newValue.finishKey != null) {
                     var finishButton = new Button(AppI18n.get(newValue.finishKey));
+                    Shortcuts.addShortcut(finishButton, new KeyCodeCombination(KeyCode.ENTER));
                     Styles.toggleStyleClass(finishButton, Styles.FLAT);
                     finishButton.setOnAction(event -> {
                         newValue.onFinish.run();