diff --git a/client/js/socket-events/join.js b/client/js/socket-events/join.js
index 441383d7..1eaab574 100644
--- a/client/js/socket-events/join.js
+++ b/client/js/socket-events/join.js
@@ -9,7 +9,7 @@ const sidebar = $("#sidebar");
 
 socket.on("join", function(data) {
 	const id = data.network;
-	const network = sidebar.find(`#network-${id}-chanlist`);
+	const network = sidebar.find(`#network-${id}`);
 	network.append(
 		templates.chan({
 			channels: [data.chan],
diff --git a/client/js/socket-events/quit.js b/client/js/socket-events/quit.js
index 948f4be5..bf176677 100644
--- a/client/js/socket-events/quit.js
+++ b/client/js/socket-events/quit.js
@@ -7,7 +7,7 @@ const sidebar = $("#sidebar");
 
 socket.on("quit", function(data) {
 	const id = data.network;
-	const network = sidebar.find(`#network-${id}-chanlist`);
+	const network = sidebar.find(`#network-${id}`);
 
 	network.children(".chan").each(function() {
 		// this = child
diff --git a/client/js/socket-events/sync_sort.js b/client/js/socket-events/sync_sort.js
index 2612239b..3ec9c890 100644
--- a/client/js/socket-events/sync_sort.js
+++ b/client/js/socket-events/sync_sort.js
@@ -24,12 +24,12 @@ socket.on("sync_sort", function(data) {
 				return true; // No point in continuing
 			}
 
-			const network = container.find(`#network-${data.target}-chanlist`);
+			const network = container.find(`#network-${data.target}`);
 
 			$(network).insertBefore(position);
 		});
 	} else if (type === "channels") {
-		const network = $(`#network-${data.target}-chanlist`);
+		const network = $(`#network-${data.target}`);
 
 		$.each(order, function(index, value) {
 			if (index === 0) { // Shouldn't attempt to move lobby
diff --git a/client/views/network.tpl b/client/views/network.tpl
index cca45a5e..f3230a24 100644
--- a/client/views/network.tpl
+++ b/client/views/network.tpl
@@ -5,12 +5,11 @@
 	data-id="{{id}}"
 	data-nick="{{nick}}"
 	data-options="{{tojson serverOptions}}"
+	role="region"
 >
-	<div id="network-{{id}}-chanlist" role="region" class="chanlist">
-		<button class="collapse-network" aria-label="Collapse" data-id="{{id}}"
-			aria-controls="network-{{id}}-chanlist" aria-expanded="true">
-		</button>
-		{{> chan}}
-	</div>
+	<button class="collapse-network" aria-label="Collapse" data-id="{{id}}"
+		aria-controls="network-{{id}}" aria-expanded="true">
+	</button>
+	{{> chan}}
 </section>
 {{/each}}