diff --git a/apps/home/static/home/js/servers.js b/apps/home/static/home/js/servers.js
index 1d4bf0c..ef99351 100644
--- a/apps/home/static/home/js/servers.js
+++ b/apps/home/static/home/js/servers.js
@@ -204,12 +204,6 @@ $("#backToSelectServer").on("click", function() {
 
 function selectServer(id) {
     let server = getServerFromSnowflake(id);
-    if (!server) {
-        $("#noSelectedServer").show();
-        $("#selectedServerContainer").hide();
-        selectedServer = null;
-        return;
-    }
 
     // Change appearance of selected vs none-selected items
     $("#serverList .sidebar-item").removeClass("active");
@@ -218,15 +212,23 @@ function selectServer(id) {
     // Global variable
     selectedServer = server;
 
+    // Close sidebar on smaller screens
+    setSidebarVisibility(false);
+
+    // Show no server selected if that's the case
+    if (!server) {
+        $("#noSelectedServer").show();
+        $("#selectedServerContainer").hide();
+        return;
+    }
+
     // Update UI
     $("#noSelectedServer").hide();
     $("#selectedServerContainer").show().css("display", "flex");
 
-    // Close sidebar on smaller screens
-    setSidebarVisibility(false);
-
     // Announce change to any listeners
     $(document).trigger("selectedServerChange");
+
 }
 
 
@@ -384,6 +386,10 @@ const eraseServerData = async server => {
     await loadServers(false);
 }
 
+$(".js-closeServerBtn").on("click", () => {
+    selectServer(null);
+});
+
 $(".js-eraseServerBtn").on("click", () => {
     const server = selectedServer;  // Store incase it changes
     const itemsToLose = arrayToHtmlList([
diff --git a/apps/home/templates/home/index.html b/apps/home/templates/home/index.html
index e9ffdf1..2037184 100644
--- a/apps/home/templates/home/index.html
+++ b/apps/home/templates/home/index.html
@@ -115,6 +115,12 @@
                                         <li>
                                             <hr class="dropdown-divider">
                                         </li>
+                                        <li>
+                                            <button type="button" class="js-closeServerBtn dropdown-item">
+                                                <i class="bi bi-arrow-return-right"></i>
+                                                <span class="ms-2">Close Server</span>
+                                            </button>
+                                        </li>
                                         <li>
                                             <button type="button" class="js-eraseServerBtn dropdown-item text-danger">
                                                 <i class="bi-trash3"></i>