diff --git a/gui/src/main.rs b/gui/src/main.rs
index 1661afa..0633563 100644
--- a/gui/src/main.rs
+++ b/gui/src/main.rs
@@ -923,6 +923,13 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
                                 address.set(evt.value());
                             }
                         },
+                        onblur: move |_| {
+                            let (host, maybe_port) = split_host_port(&address.read());
+                            if let Some(p) = maybe_port {
+                                address.set(host);
+                                port.set(p);
+                            }
+                        },
                         required: true,
                     }
                     div {
@@ -1064,6 +1071,13 @@ fn EditServerModal(
                                 address.set(evt.value());
                             }
                         },
+                        onblur: move |_| {
+                            let (host, maybe_port) = split_host_port(&address.read());
+                            if let Some(p) = maybe_port {
+                                address.set(host);
+                                port.set(p);
+                            }
+                        },
                         required: true,
                     }
                     div {