diff --git a/client/components/JoinChannel.vue b/client/components/JoinChannel.vue
index d95dbe82..4e00b6f6 100644
--- a/client/components/JoinChannel.vue
+++ b/client/components/JoinChannel.vue
@@ -50,6 +50,7 @@ export default {
 		},
 	},
 	props: {
+		network: Object,
 		channel: Object,
 	},
 	data() {
@@ -60,8 +61,8 @@ export default {
 	},
 	methods: {
 		onSubmit() {
-			const utils = require("../js/utils");
-			const existingChannel = utils.findCurrentNetworkChan(this.inputChannel);
+			const channelToFind = this.inputChannel.toLowerCase();
+			const existingChannel = this.network.channels.find((c) => c.name.toLowerCase() === channelToFind);
 
 			if (existingChannel) {
 				const $ = require("jquery");
diff --git a/client/components/NetworkList.vue b/client/components/NetworkList.vue
index cc0e0bdd..fbec4888 100644
--- a/client/components/NetworkList.vue
+++ b/client/components/NetworkList.vue
@@ -35,6 +35,7 @@
 			/>
 			<JoinChannel
 				v-if="network.isJoinChannelShown"
+				:network="network"
 				:channel="network.channels[0]"
 				@toggleJoinChannel="network.isJoinChannelShown = !network.isJoinChannelShown"
 			/>