diff --git a/client/components/ChannelWrapper.vue b/client/components/ChannelWrapper.vue
index 516f14d2..380b52af 100644
--- a/client/components/ChannelWrapper.vue
+++ b/client/components/ChannelWrapper.vue
@@ -81,7 +81,7 @@ export default defineComponent({
 				}
 			}
 
-			return `${type}: ${props.channel.name}${extra.length ? `(${extra.join(", ")})` : ""}`;
+			return `${type}: ${props.channel.name} ${extra.length ? `(${extra.join(", ")})` : ""}`;
 		};
 
 		const click = () => {
diff --git a/client/components/ContextMenu.vue b/client/components/ContextMenu.vue
index 838be596..a172e0ad 100644
--- a/client/components/ContextMenu.vue
+++ b/client/components/ContextMenu.vue
@@ -102,7 +102,7 @@ export default defineComponent({
 			});
 		};
 
-		const containerClick = (event) => {
+		const containerClick = (event: MouseEvent) => {
 			if (event.currentTarget === event.target) {
 				close();
 			}
diff --git a/client/components/Message.vue b/client/components/Message.vue
index 48bd104d..65167784 100644
--- a/client/components/Message.vue
+++ b/client/components/Message.vue
@@ -17,12 +17,14 @@
 			aria-hidden="true"
 			:aria-label="messageTimeLocale"
 			class="time tooltipped tooltipped-e"
-			>{{ messageTime }}
+			>{{ `${messageTime} ` }}
 		</span>
 		<template v-if="message.type === 'unhandled'">
 			<span class="from">[{{ message.command }}]</span>
 			<span class="content">
-				<span v-for="(param, id) in message.params" :key="id">{{ param }} </span>
+				<span v-for="(param, id) in message.params" :key="id">{{
+					`&#32;${param}&#32;`
+				}}</span>
 			</span>
 		</template>
 		<template v-else-if="isAction()">
diff --git a/client/components/MessageTypes/join.vue b/client/components/MessageTypes/join.vue
index 94134f87..6d80b0ab 100644
--- a/client/components/MessageTypes/join.vue
+++ b/client/components/MessageTypes/join.vue
@@ -1,12 +1,12 @@
 <template>
 	<span class="content">
 		<Username :user="message.from" />
-		<i class="hostmask"> (<ParsedMessage :network="network" :text="message.hostmask" />) </i>
+		<i class="hostmask">&#32;(<ParsedMessage :network="network" :text="message.hostmask" />)</i>
 		<template v-if="message.account">
-			<i class="account">[{{ message.account }}]</i>
+			<i class="account">&#32;[{{ message.account }}]</i>
 		</template>
 		<template v-if="message.gecos">
-			<i class="realname">{{ message.gecos }}</i>
+			<i class="realname">&#32;({{ message.gecos }})</i>
 		</template>
 		has joined the channel
 	</span>