diff --git a/src/renderer/settings.ts b/src/renderer/settings.ts
index 4c5c299..651cdaf 100644
--- a/src/renderer/settings.ts
+++ b/src/renderer/settings.ts
@@ -50,7 +50,7 @@ export function load(callback: (err: Error) => void) {
 
     if (dataJSON == null) {
       // Setup defaults
-      const myServerEntry = { hostname: "127.0.0.1", port: "4237", label: i18n.t("server:myServer"), id: "0" };
+      const myServerEntry: ServerEntry = { id: "0", hostname: "127.0.0.1", port: "4237", label: i18n.t("server:myServer") };
       favoriteServers = [ myServerEntry ];
       favoriteServersById[myServerEntry.id] = myServerEntry;
 
diff --git a/src/renderer/sidebar/AddOrEditServerDialog.ts b/src/renderer/sidebar/AddOrEditServerDialog.ts
index b02e733..a28cf5f 100644
--- a/src/renderer/sidebar/AddOrEditServerDialog.ts
+++ b/src/renderer/sidebar/AddOrEditServerDialog.ts
@@ -104,7 +104,8 @@ export default class AddOrEditServerDialog extends BaseDialog<AddOrEditServerRes
   }
 
   submit() {
-    const result = {
+    const result: ServerEntry = {
+      id: null,
       hostname: this.hostnameInputElt.value,
       port: this.portInputElt.value !== "" ? this.portInputElt.value : null,
       label: this.labelInputElt.value
diff --git a/src/renderer/tabs/openServer.ts b/src/renderer/tabs/openServer.ts
index 641dd56..13caaee 100644
--- a/src/renderer/tabs/openServer.ts
+++ b/src/renderer/tabs/openServer.ts
@@ -40,7 +40,7 @@ function makeServerTab(serverEntry: ServerEntry) {
 
   const locationElt = document.createElement("div");
   locationElt.className = "location";
-  locationElt.textContent = `${serverEntry.hostname}:${serverEntry.port}`;
+  locationElt.textContent = serverEntry.hostname + (serverEntry.port != null ? `:${serverEntry.port}` : "");
   labelElt.appendChild(locationElt);
 
   const nameElt = document.createElement("div");