diff --git a/client/components/Channel.vue b/client/components/Channel.vue
index 15d2fdf4..e00bcc76 100644
--- a/client/components/Channel.vue
+++ b/client/components/Channel.vue
@@ -1,13 +1,14 @@
 <template>
 	<div
+		v-if="!network.isCollapsed || channel.highlight || channel.type === 'lobby'"
 		:key="channel.id"
-		:class="[ channel.type, { active: activeChannel && channel.id === activeChannel.channel.id } ]"
+		:class="[ channel.type, { active: activeChannel && channel === activeChannel.channel } ]"
 		:aria-label="channel.name"
 		:title="channel.name"
 		:data-id="channel.id"
 		:data-target="'#chan-' + channel.id"
 		:aria-controls="'#chan-' + channel.id"
-		:aria-selected="activeChannel && channel.id === activeChannel.channel.id"
+		:aria-selected="activeChannel && channel === activeChannel.channel"
 		class="chan"
 		role="tab"
 	>
@@ -15,9 +16,10 @@
 			<button
 				v-if="network.channels.length > 1"
 				:aria-controls="'network-' + network.uuid"
+				:aria-label="getExpandLabel(network)"
+				:aria-expanded="!network.isCollapsed"
 				class="collapse-network"
-				aria-label="Collapse"
-				aria-expanded="true"
+				@click.prevent="onCollapseClick"
 			>
 				<span class="collapse-network-icon"/>
 			</button>
@@ -84,6 +86,8 @@
 </template>
 
 <script>
+const storage = require("../js/localStorage");
+
 export default {
 	name: "Channel",
 	props: {
@@ -91,5 +95,22 @@ export default {
 		network: Object,
 		channel: Object,
 	},
+	methods: {
+		onCollapseClick() {
+			const networks = new Set(JSON.parse(storage.get("thelounge.networks.collapsed")));
+			this.network.isCollapsed = !this.network.isCollapsed;
+
+			if (this.network.isCollapsed) {
+				networks.add(this.network.uuid);
+			} else {
+				networks.delete(this.network.uuid);
+			}
+
+			storage.set("thelounge.networks.collapsed", JSON.stringify([...networks]));
+		},
+		getExpandLabel(network) {
+			return network.isCollapsed ? "Expand" : "Collapse";
+		},
+	},
 };
 </script>
diff --git a/client/components/ChatUserList.vue b/client/components/ChatUserList.vue
index 53009ef4..90406384 100644
--- a/client/components/ChatUserList.vue
+++ b/client/components/ChatUserList.vue
@@ -3,11 +3,11 @@
 		<div class="count">
 			<input
 				:placeholder="channel.users.length + ' user' + (channel.users.length === 1 ? '' : 's')"
+				v-model="userSearchInput"
 				type="search"
 				class="search"
 				aria-label="Search among the user list"
 				tabindex="-1"
-				v-model="userSearchInput"
 			>
 		</div>
 		<div class="names">
@@ -57,7 +57,7 @@ export default {
 	props: {
 		channel: Object,
 	},
-	data: function() {
+	data() {
 		return {
 			userSearchInput: "",
 		};
@@ -101,9 +101,6 @@ export default {
 		getModeClass(mode) {
 			return modes[mode];
 		},
-		onInput(e) {
-			console.log(this.channel.userSearchInput);
-		},
 	},
 };
 </script>
diff --git a/client/components/Network.vue b/client/components/Network.vue
index 93359942..d5e15814 100644
--- a/client/components/Network.vue
+++ b/client/components/Network.vue
@@ -16,7 +16,11 @@
 		<div
 			v-for="network in networks"
 			:key="network.uuid"
-			:class="{ 'not-connected': !network.status.connected, 'not-secure': !network.status.secure }"
+			:class="{
+				collapsed: network.isCollapsed,
+				'not-connected': !network.status.connected,
+				'not-secure': !network.status.secure,
+			}"
 			:id="'network-' + network.uuid"
 			:data-uuid="network.uuid"
 			:data-nick="network.nick"
diff --git a/client/components/UsernameFiltered.vue b/client/components/UsernameFiltered.vue
index f24d17e5..27567332 100644
--- a/client/components/UsernameFiltered.vue
+++ b/client/components/UsernameFiltered.vue
@@ -2,7 +2,8 @@
 	<span
 		:class="['user', $options.filters.colorClass(user.original.nick)]"
 		:data-name="user.original.nick"
-		role="button" v-html="user.original.mode + user.string"/>
+		role="button"
+		v-html="user.original.mode + user.string"/>
 </template>
 
 <script>
diff --git a/client/css/style.css b/client/css/style.css
index 893ebf36..cbc72e55 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -563,10 +563,6 @@ kbd {
 	font-size: 14px;
 }
 
-#sidebar .network.collapsed .chan:not(.lobby) {
-	display: none;
-}
-
 #sidebar .chan {
 	cursor: pointer;
 }
diff --git a/client/js/render.js b/client/js/render.js
index a67be131..5b5e04fc 100644
--- a/client/js/render.js
+++ b/client/js/render.js
@@ -8,9 +8,7 @@ const utils = require("./utils");
 const constants = require("./constants");
 const condensed = require("./condensed");
 const JoinChannel = require("./join-channel");
-const storage = require("./localStorage");
 const {vueApp} = require("./vue");
-const sidebar = $("#sidebar");
 
 module.exports = {
 	renderNetworks,
@@ -113,17 +111,11 @@ function buildChatMessage(msg) {
 }
 
 function renderNetworks(data, singleNetwork) {
-	const collapsed = new Set(JSON.parse(storage.get("thelounge.networks.collapsed")));
-
 	// Add keyboard handlers to the "Join a channel…" form inputs/button
 	JoinChannel.handleKeybinds(data.networks);
 
 	let newChannels;
 	const channels = $.map(data.networks, function(n) {
-		if (collapsed.has(n.uuid)) {
-			collapseNetwork($(`.network[data-uuid="${n.uuid}"] button.collapse-network`));
-		}
-
 		return n.channels;
 	});
 
@@ -194,32 +186,3 @@ function trimMessageInChannel(channel, messageLimit) {
 		}
 	});
 }
-
-sidebar.on("click", "button.collapse-network", (e) => collapseNetwork($(e.target)));
-
-function collapseNetwork(target) {
-	const collapseButton = target.closest(".collapse-network");
-	const networks = new Set(JSON.parse(storage.get("thelounge.networks.collapsed")));
-	const networkuuid = collapseButton.closest(".network").data("uuid");
-
-	if (collapseButton.closest(".network").find(".active").length > 0) {
-		collapseButton.closest(".lobby").trigger("click", {
-			keepSidebarOpen: true,
-		});
-	}
-
-	collapseButton.closest(".network").toggleClass("collapsed");
-
-	if (collapseButton.attr("aria-expanded") === "true") {
-		collapseButton.attr("aria-expanded", false);
-		collapseButton.attr("aria-label", "Expand");
-		networks.add(networkuuid);
-	} else {
-		collapseButton.attr("aria-expanded", true);
-		collapseButton.attr("aria-label", "Collapse");
-		networks.delete(networkuuid);
-	}
-
-	storage.set("thelounge.networks.collapsed", JSON.stringify([...networks]));
-	return false;
-}
diff --git a/client/js/socket-events/init.js b/client/js/socket-events/init.js
index ce4317b2..91b3bc8b 100644
--- a/client/js/socket-events/init.js
+++ b/client/js/socket-events/init.js
@@ -21,6 +21,12 @@ socket.on("init", function(data) {
 		previousActive = sidebar.find(".active").data("id");
 	}
 
+	const networks = new Set(JSON.parse(storage.get("thelounge.networks.collapsed")));
+
+	for (const network of data.networks) {
+		network.isCollapsed = networks.has(network.uuid);
+	}
+
 	vueApp.networks = data.networks;
 
 	if (data.networks.length > 0) {
diff --git a/client/views/user_filtered.tpl b/client/views/user_filtered.tpl
deleted file mode 100644
index c684e3a2..00000000
--- a/client/views/user_filtered.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="user-mode user-mode-search">
-{{#each matches}}
-	<span role="button" class="{{original.className}}" data-name="{{original.dataset.name}}">{{{string}}}</span>
-{{/each}}
-</div>