diff --git a/src/View/.chatPage.css.swp b/src/View/.chatPage.css.swp
deleted file mode 100644
index 7a6166dc..00000000
Binary files a/src/View/.chatPage.css.swp and /dev/null differ
diff --git a/src/View/.chatPage.tsx.swp b/src/View/Modals/.connectionModal.tsx.swp
similarity index 56%
rename from src/View/.chatPage.tsx.swp
rename to src/View/Modals/.connectionModal.tsx.swp
index 6727117d..388ae278 100644
Binary files a/src/View/.chatPage.tsx.swp and b/src/View/Modals/.connectionModal.tsx.swp differ
diff --git a/src/View/chatPage.tsx b/src/View/chatPage.tsx
index ca1cd558..e612759e 100644
--- a/src/View/chatPage.tsx
+++ b/src/View/chatPage.tsx
@@ -95,44 +95,47 @@ export function ChatPage(
                         toggle:hidden={
                             chatViewModel.connectionViewModel.isConnected
                         }
-                    >
-                        <span class="icon">signal_disconnected</span>
-                    </button>
+			toggle:disabled={
+			    chatViewModel.connectionViewModel.hasNoPreviousConnections
+			}
+		    >
+			<span class="icon">signal_disconnected</span>
+		    </button>
 
-                    <span class="marquee" children:set={marqueeContent}></span>
+		    <span class="marquee" children:set={marqueeContent}></span>
 
-                    <span class="navigation-buttons">
-                        {ChatViewToggleButton(
-                            coreViewModel.translations.chatPage.pages.calendar,
-                            "calendar_month",
-                            ChatPageTypes.Calendar,
-                            chatViewModel,
-                        )}
-                        {ChatViewToggleButton(
-                            coreViewModel.translations.chatPage.pages.tasks,
-                            "task_alt",
-                            ChatPageTypes.Tasks,
-                            chatViewModel,
-                        )}
-                        {ChatViewToggleButton(
-                            coreViewModel.translations.chatPage.pages.messages,
-                            "forum",
-                            ChatPageTypes.Messages,
-                            chatViewModel,
-                        )}
-                        {ChatViewToggleButton(
-                            coreViewModel.translations.chatPage.pages.settings,
-                            "settings",
-                            ChatPageTypes.Settings,
-                            chatViewModel,
-                        )}
-                    </span>
-                </div>
-                <div
-                    id="main"
-                    children:set={ViewController.chatPages.state}
-                ></div>
-            </div>
-        </article>
+		    <span class="navigation-buttons">
+			{ChatViewToggleButton(
+			    coreViewModel.translations.chatPage.pages.calendar,
+			    "calendar_month",
+			    ChatPageTypes.Calendar,
+			    chatViewModel,
+			)}
+    {ChatViewToggleButton(
+	coreViewModel.translations.chatPage.pages.tasks,
+	"task_alt",
+	ChatPageTypes.Tasks,
+	chatViewModel,
+    )}
+    {ChatViewToggleButton(
+	coreViewModel.translations.chatPage.pages.messages,
+	"forum",
+	ChatPageTypes.Messages,
+	chatViewModel,
+    )}
+    {ChatViewToggleButton(
+	coreViewModel.translations.chatPage.pages.settings,
+	"settings",
+	ChatPageTypes.Settings,
+	chatViewModel,
+    )}
+</span>
+		</div>
+		<div
+		    id="main"
+		    children:set={ViewController.chatPages.state}
+		></div>
+	    </div>
+	</article>
     );
 }
diff --git a/src/ViewModel/Global/.connectionViewModel.ts.swp b/src/ViewModel/Global/.connectionViewModel.ts.swp
new file mode 100644
index 00000000..63356017
Binary files /dev/null and b/src/ViewModel/Global/.connectionViewModel.ts.swp differ
diff --git a/src/ViewModel/Global/connectionViewModel.ts b/src/ViewModel/Global/connectionViewModel.ts
index b3814e26..fdc104cd 100644
--- a/src/ViewModel/Global/connectionViewModel.ts
+++ b/src/ViewModel/Global/connectionViewModel.ts
@@ -47,6 +47,8 @@ export default class ConnectionViewModel {
                 this.coreViewModel.connectionModel.address,
             );
         }
+
+	this.hideConnectionModal();
     };
 
     // methods
@@ -66,6 +68,9 @@ export default class ConnectionViewModel {
     removePreviousAddress = (address: string): void => {
         this.coreViewModel.connectionModel.removeAddress(address);
         this.updatePreviousAddresses();
+
+	if (this.previousAddresses.value.size > 0) return;
+	this.hideConnectionModal();
     };
 
     // view