diff --git a/client/components/Windows/NetworkEdit.vue b/client/components/Windows/NetworkEdit.vue
index 1c36f7a3..17d2dc5d 100644
--- a/client/components/Windows/NetworkEdit.vue
+++ b/client/components/Windows/NetworkEdit.vue
@@ -8,9 +8,7 @@
 </template>
 
 <script>
-const $ = require("jquery");
 const socket = require("../../js/socket");
-
 import NetworkForm from "../NetworkForm.vue";
 
 export default {
@@ -41,11 +39,11 @@ export default {
 			this.disabled = true;
 			socket.emit("network:edit", data);
 
-			const sidebar = $("#sidebar");
 			// TODO: move networks to vuex and update state when the network info comes in
 			const network = this.$store.getters.findNetwork(data.uuid);
 			network.name = network.channels[0].name = data.name;
-			sidebar.find(`.network[data-uuid="${data.uuid}"] .chan.lobby .name`).click();
+
+			this.$root.switchToChannel(network.channels[0]);
 		},
 	},
 };
diff --git a/client/js/socket-events/msg.js b/client/js/socket-events/msg.js
index bd0f532d..8860ba55 100644
--- a/client/js/socket-events/msg.js
+++ b/client/js/socket-events/msg.js
@@ -155,12 +155,10 @@ function notifyMessage(targetId, channel, activeChannel, msg) {
 							this.close();
 							window.focus();
 
-							const channelTarget = document.querySelector(
-								"#sidebar .chan[data-id='" + targetId + "']"
-							);
+							const channelTarget = store.getters.findChannel(targetId);
 
 							if (channelTarget) {
-								channelTarget.click();
+								vueApp.switchToChannel(channelTarget);
 							}
 						});
 					}
diff --git a/client/js/webpush.js b/client/js/webpush.js
index d5f6c738..8115f0e7 100644
--- a/client/js/webpush.js
+++ b/client/js/webpush.js
@@ -2,6 +2,7 @@
 
 const storage = require("./localStorage");
 const socket = require("./socket");
+const vueApp = require("./vue");
 const store = require("./store").default;
 
 let clientSubscribed = null;
@@ -10,12 +11,11 @@ let applicationServerKey;
 if ("serviceWorker" in navigator) {
 	navigator.serviceWorker.addEventListener("message", (event) => {
 		if (event.data && event.data.type === "open") {
-			const channelTarget = document.querySelector(
-				"#sidebar .chan[data-target='#" + event.data.channel + "']"
-			);
+			const id = event.data.channel.substr(5); // remove "chan-" prefix
+			const channelTarget = store.getters.findChannel(id);
 
 			if (channelTarget) {
-				channelTarget.click();
+				vueApp.switchToChannel(channelTarget);
 			}
 		}
 	});
diff --git a/client/service-worker.js b/client/service-worker.js
index af8021fa..153a2659 100644
--- a/client/service-worker.js
+++ b/client/service-worker.js
@@ -156,7 +156,7 @@ self.addEventListener("notificationclick", function(event) {
 			.then((clientList) => {
 				if (clientList.length === 0) {
 					if (clients.openWindow) {
-						return clients.openWindow(`.#${event.notification.tag}`);
+						return clients.openWindow(`.#/${event.notification.tag}`);
 					}
 
 					return;