diff --git a/dist/index.js b/dist/index.js
index 7f741675..566dd9ef 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -238,8 +238,9 @@
       addChatButton: "Add chat"
     },
     connectionModal: {
-      connectionModalHeadline: "Manage Connections"
+      connectionModalHeadline: "Manage Connections",
       ///
+      connectButtonAudioLabel: "connect"
     }
   };
   var allTranslations = {
@@ -249,8 +250,8 @@
   var translations = allTranslations[language] || allTranslations.en;
 
   // src/View/Components/deletableListItem.tsx
-  function DeletableListItem(text, ondelete) {
-    return /* @__PURE__ */ createElement("div", { class: "tile flex-row justify-apart align-center padding-0" }, /* @__PURE__ */ createElement("span", { class: "padding-h" }, text), /* @__PURE__ */ createElement(
+  function DeletableListItem(text, primaryButton, ondelete) {
+    return /* @__PURE__ */ createElement("div", { class: "tile flex-row justify-apart align-center padding-0" }, /* @__PURE__ */ createElement("span", { class: "padding-h" }, text), /* @__PURE__ */ createElement("div", { class: "flex-row justify-end" }, primaryButton, /* @__PURE__ */ createElement(
       "button",
       {
         class: "danger",
@@ -258,15 +259,35 @@
         "on:click": ondelete
       },
       /* @__PURE__ */ createElement("span", { class: "icon" }, "delete")
-    ));
+    )));
   }
 
   // src/View/Modals/connectionModal.tsx
   function ConnectionModal(connectionViewModel2) {
     const previousAddressConverter = (address) => {
-      return DeletableListItem(address, () => {
-        connectionViewModel2.removePreviousAddress(address);
-      });
+      function connnect() {
+        connectionViewModel2.connectToAddress(address);
+      }
+      const cannotConnect = createProxyState(
+        [connectionViewModel2.isConnected],
+        () => connectionViewModel2.connectionModel.address == address
+      );
+      return DeletableListItem(
+        address,
+        /* @__PURE__ */ createElement(
+          "button",
+          {
+            class: "primary",
+            "on:click": connnect,
+            "toggle:disabled": cannotConnect,
+            "aria-label": translations.connectionModal.connectButtonAudioLabel
+          },
+          /* @__PURE__ */ createElement("span", { class: "icon" }, "link")
+        ),
+        () => {
+          connectionViewModel2.removePreviousAddress(address);
+        }
+      );
     };
     return /* @__PURE__ */ createElement(
       "div",
@@ -597,7 +618,10 @@
     };
     // methods
     connect = () => {
-      this.connectionModel.connect(this.serverAddressInput.value);
+      this.connectToAddress(this.serverAddressInput.value);
+    };
+    connectToAddress = (address) => {
+      this.connectionModel.connect(address);
     };
     disconnect = () => {
       this.connectionModel.disconnect();
@@ -791,13 +815,7 @@
   };
 
   // src/index.tsx
-  localStorage.clear();
   var storageModel = new StorageModel();
-  storageModel.store(["a", "b", "b1"], "");
-  storageModel.store(["a", "b", "b2"], "");
-  console.log(JSON.stringify(storageModel.storageEntryTree, null, 4));
-  storageModel.remove(["a", "b", "b2"]);
-  console.log(JSON.stringify(storageModel.storageEntryTree, null, 4));
   var settingsViewModel = new SettingsViewModel(storageModel);
   var connectionViewModel = new ConnectionViewModel(storageModel);
   document.querySelector("main").append(
diff --git a/src/View/Components/deletableListItem.tsx b/src/View/Components/deletableListItem.tsx
index 8bc4b8e9..9a4f4c76 100644
--- a/src/View/Components/deletableListItem.tsx
+++ b/src/View/Components/deletableListItem.tsx
@@ -2,18 +2,26 @@ import * as React from "bloatless-react";
 
 import { translations } from "../translations";
 
-export function DeletableListItem(text: string, ondelete: () => void) {
+export function DeletableListItem(
+  text: string,
+  primaryButton: HTMLElement,
+  ondelete: () => void
+) {
   return (
     <div class="tile flex-row justify-apart align-center padding-0">
       <span class="padding-h">{text}</span>
 
-      <button
-        class="danger"
-        aria-label={translations.general.deleteItemButtonAudioLabel}
-        on:click={ondelete}
-      >
-        <span class="icon">delete</span>
-      </button>
+      <div class="flex-row justify-end">
+        {primaryButton}
+
+        <button
+          class="danger"
+          aria-label={translations.general.deleteItemButtonAudioLabel}
+          on:click={ondelete}
+        >
+          <span class="icon">delete</span>
+        </button>
+      </div>
     </div>
   );
-}
\ No newline at end of file
+}
diff --git a/src/View/Modals/connectionModal.tsx b/src/View/Modals/connectionModal.tsx
index e6d4e38f..b534fad9 100644
--- a/src/View/Modals/connectionModal.tsx
+++ b/src/View/Modals/connectionModal.tsx
@@ -8,9 +8,29 @@ export function ConnectionModal(connectionViewModel: ConnectionViewModel) {
   const previousAddressConverter: React.StateItemConverter<string> = (
     address: string
   ) => {
-    return DeletableListItem(address, () => {
-      connectionViewModel.removePreviousAddress(address);
-    });
+    function connnect() {
+      connectionViewModel.connectToAddress(address);
+    }
+
+    const cannotConnect = React.createProxyState(
+      [connectionViewModel.isConnected],
+      () => connectionViewModel.connectionModel.address == address
+    );
+
+    return DeletableListItem(
+      address,
+      <button
+        class="primary"
+        on:click={connnect}
+        toggle:disabled={cannotConnect}
+        aria-label={translations.connectionModal.connectButtonAudioLabel}
+      >
+        <span class="icon">link</span>
+      </button>,
+      () => {
+        connectionViewModel.removePreviousAddress(address);
+      }
+    );
   };
 
   return (
diff --git a/src/View/translations.ts b/src/View/translations.ts
index 974be5dd..4467cbee 100644
--- a/src/View/translations.ts
+++ b/src/View/translations.ts
@@ -69,6 +69,8 @@ const englishTranslations = {
     connectionModalHeadline: "Manage Connections",
 
     ///
+
+    connectButtonAudioLabel: "connect",
   },
 };
 
diff --git a/src/ViewModel/connectionViewModel.tsx b/src/ViewModel/connectionViewModel.tsx
index 46698628..61f1257e 100644
--- a/src/ViewModel/connectionViewModel.tsx
+++ b/src/ViewModel/connectionViewModel.tsx
@@ -43,9 +43,13 @@ export default class ConnectionViewModel {
 
   // methods
   connect = (): void => {
-    this.connectionModel.connect(this.serverAddressInput.value);
+    this.connectToAddress(this.serverAddressInput.value);
   };
-
+  
+  connectToAddress = (address: string): void => {
+    this.connectionModel.connect(address);
+  }
+  
   disconnect = (): void => {
     this.connectionModel.disconnect();
   };