diff --git a/src/ui/app.rs b/src/ui/app.rs
index 24fa66c..befa8c3 100644
--- a/src/ui/app.rs
+++ b/src/ui/app.rs
@@ -238,7 +238,8 @@ impl eframe::App for FileManagerApp {
                     egui::TextEdit::singleline(&mut self.state.onboarding_port)
                         .id("onb_port".into())
                         .desired_width(60.0)
-                        .hint_text("22"),
+                        .char_limit(5)
+                        .hint_text("port"),
                 );
             });
 
@@ -271,7 +272,11 @@ impl eframe::App for FileManagerApp {
                                 self.state.connect_host = self.state.onboarding_host.clone();
                                 self.state.connect_user = self.state.onboarding_user.clone();
                                 self.state.connect_pass = self.state.onboarding_pass.clone();
-                                self.state.connect_port = self.state.onboarding_port.clone();
+                                self.state.connect_port = if self.state.onboarding_port.is_empty() {
+                                    "22".into()
+                                } else {
+                                    self.state.onboarding_port.clone()
+                                };
                                 self.state.connect_protocol = 0;
                                 self.state.show_connect_dialog = true;
                             }
diff --git a/src/ui/state.rs b/src/ui/state.rs
index 241af8a..b5ef70c 100644
--- a/src/ui/state.rs
+++ b/src/ui/state.rs
@@ -73,7 +73,7 @@ impl Default for AppState {
             onboarding_host: String::new(),
             onboarding_user: String::new(),
             onboarding_pass: String::new(),
-            onboarding_port: "22".into(),
+            onboarding_port: String::new(),
             connect_label: String::new(),
             connect_host: String::new(),
             connect_port: "22".into(),