diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/InputDialogPane.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/InputDialogPane.java
index d2c06b5d9..0def6d51a 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/InputDialogPane.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/InputDialogPane.java
@@ -30,7 +30,7 @@ import java.util.concurrent.CompletableFuture;
 import static org.jackhuang.hmcl.ui.FXUtils.onEscPressed;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
-public class InputDialogPane extends JFXDialogLayout {
+public class InputDialogPane extends JFXDialogLayout implements DialogAware {
     private final CompletableFuture<String> future = new CompletableFuture<>();
 
     private final JFXTextField textField;
@@ -70,9 +70,15 @@ public class InputDialogPane extends JFXDialogLayout {
             });
         });
 
+        textField.setOnAction(event -> acceptButton.fire());
         onEscPressed(this, cancelButton::fire);
     }
 
+    @Override
+    public void onDialogShown() {
+        textField.requestFocus();
+    }
+
     public CompletableFuture<String> getCompletableFuture() {
         return future;
     }