diff --git a/client/client.js b/client/client.js
index 2f33dc6..84ad60c 100644
--- a/client/client.js
+++ b/client/client.js
@@ -316,7 +316,7 @@ function pushMessage(args) {
 
 	if (
 		typeof (myNick) === 'string' && (
-			args.text.match(new RegExp('@' + myNick.split('#')[0], "gi")) ||
+			args.text.match(new RegExp('@' + myNick.split('#')[0] + '\\b', "gi")) ||
 			((args.type === "whisper" || args.type === "invite") && args.from)
 		)
 	) {