diff --git a/dist/index.js b/dist/index.js
index ecc80cd6..4514b807 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -616,6 +616,7 @@
     false
   );
   var currentAddress = restoreState("current-address", "");
+  var previousAddresses = restoreListState("previous-addresses");
   var cannotDisonnect = createProxyState(
     [isConnected],
     () => isConnected.value == false
@@ -631,6 +632,7 @@
   function connect() {
     if (cannotConnect.value == true) return;
     currentAddress.value = serverAddressInput.value;
+    previousAddresses.add(currentAddress.value);
     isConnected.value = false;
     didRequestConnection.value = true;
     UDN.connect(serverAddressInput.value);
@@ -1082,13 +1084,24 @@
   }
 
   // src/Views/connectionSection.tsx
+  var addressConverter = (address) => {
+    return /* @__PURE__ */ createElement("option", null, address);
+  };
   function ConnectionSection() {
     return /* @__PURE__ */ createElement("div", { class: "flex-column" }, /* @__PURE__ */ createElement("h2", null, translation.connection), /* @__PURE__ */ createElement("label", { class: "tile" }, /* @__PURE__ */ createElement("span", { class: "icon" }, "cell_tower"), /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("span", null, translation.serverAddress), /* @__PURE__ */ createElement(
       "input",
       {
         "bind:value": serverAddressInput,
         "on:enter": connect,
-        placeholder: translation.serverAddressPlaceholder
+        placeholder: translation.serverAddressPlaceholder,
+        list: "previous-addresses"
+      }
+    ), /* @__PURE__ */ createElement(
+      "datalist",
+      {
+        hidden: true,
+        id: "previous-addresses",
+        "children:append": [previousAddresses, addressConverter]
       }
     ))), /* @__PURE__ */ createElement("div", { class: "flex-row width-input justify-end" }, /* @__PURE__ */ createElement(
       "button",
diff --git a/src/Model/model.ts b/src/Model/model.ts
index 56cba749..c8bf2d96 100644
--- a/src/Model/model.ts
+++ b/src/Model/model.ts
@@ -15,6 +15,7 @@ export const didRequestConnection = React.restoreState(
   false
 );
 export const currentAddress = React.restoreState("current-address", "");
+export const previousAddresses = React.restoreListState<string>("previous-addresses")
 
 export const cannotDisonnect = React.createProxyState(
   [isConnected],
@@ -39,6 +40,7 @@ export function connect(): void {
   if (cannotConnect.value == true) return;
 
   currentAddress.value = serverAddressInput.value;
+  previousAddresses.add(currentAddress.value);
 
   isConnected.value = false;
   didRequestConnection.value = true;
diff --git a/src/Views/connectionSection.tsx b/src/Views/connectionSection.tsx
index f45b5d0f..92460023 100644
--- a/src/Views/connectionSection.tsx
+++ b/src/Views/connectionSection.tsx
@@ -9,6 +9,7 @@ import {
   connect,
   deleteMailbox,
   disconnect,
+  previousAddresses,
   requestMailbox,
   resetAddressInput,
   serverAddressInput,
@@ -16,6 +17,10 @@ import {
 
 import { translation } from "../translations";
 
+const addressConverter: React.ListItemConverter<string> = (address) => {
+  return <option>{address}</option>;
+};
+
 export function ConnectionSection() {
   return (
     <div class="flex-column">
@@ -29,7 +34,13 @@ export function ConnectionSection() {
             bind:value={serverAddressInput}
             on:enter={connect}
             placeholder={translation.serverAddressPlaceholder}
+            list="previous-addresses"
           ></input>
+          <datalist
+            hidden
+            id="previous-addresses"
+            children:append={[previousAddresses, addressConverter]}
+          ></datalist>
         </div>
       </label>
       <div class="flex-row width-input justify-end">