diff --git a/client/js/lounge.js b/client/js/lounge.js
index 86eff6cc..c260bd76 100644
--- a/client/js/lounge.js
+++ b/client/js/lounge.js
@@ -452,9 +452,9 @@ $(function() {
 		}
 	});
 
-	sidebar.on("click", ".close", function() {
+	function closeChan(chan) {
 		var cmd = "/close";
-		var chan = $(this).closest(".chan");
+
 		if (chan.hasClass("lobby")) {
 			cmd = "/quit";
 			var server = chan.find(".name").html();
@@ -471,11 +471,15 @@ $(function() {
 			opacity: 0.4,
 		});
 		return false;
+	}
+
+	sidebar.on("click", ".close", function() {
+		closeChan($(this).closest(".chan"));
 	});
 
 	const contextMenuActions = {
 		close: function(itemData) {
-			$(`.networks .chan[data-target="${itemData}"] .close`).click();
+			closeChan($(`.networks .chan[data-target="${itemData}"]`));
 		},
 		focusChan: function(itemData) {
 			$(`.networks .chan[data-target="${itemData}"]`).click();
diff --git a/client/views/chan.tpl b/client/views/chan.tpl
index d9e9d005..351e0b36 100644
--- a/client/views/chan.tpl
+++ b/client/views/chan.tpl
@@ -1,7 +1,7 @@
 {{#each channels}}
 <div data-id="{{id}}" data-target="#chan-{{id}}" data-title="{{name}}" class="chan {{type}} chan-{{slugify name}}">
 	<span class="badge{{#if highlight}} highlight{{/if}}">{{#if unread}}{{roundBadgeNumber unread}}{{/if}}</span>
-	<button class="close" aria-label="Close"></button>
+	{{#equal type "lobby"}}{{else}}<button class="close" aria-label="Close"></button>{{/equal}}
 	<span class="name" title="{{name}}">{{name}}</span>
 </div>
 {{/each}}