diff --git a/plugins/emojifyme/emojifyme.go b/plugins/emojifyme/emojifyme.go
index d4cc975..de15e70 100644
--- a/plugins/emojifyme/emojifyme.go
+++ b/plugins/emojifyme/emojifyme.go
@@ -77,8 +77,8 @@ func (p *EmojifyMePlugin) Message(message msg.Message) bool {
 		}
 		for _, c := range candidates {
 			if strings.Contains(msg, " "+c+" ") ||
-				strings.HasPrefix(msg, c) ||
-				strings.HasSuffix(msg, c) {
+				strings.HasPrefix(msg, c+" ") ||
+				strings.HasSuffix(msg, " "+c) {
 				emojys = append(emojys, v)
 				if !stringsContain(inertTokens, k) || len(v) < 2 {
 					emojied += 1