diff --git a/client/js/options.js b/client/js/options.js
index 02b3676a..ad37bdbb 100644
--- a/client/js/options.js
+++ b/client/js/options.js
@@ -146,7 +146,7 @@ function applySetting(name, value) {
 		});
 
 		if (highlightsTokens && highlightsTokens.length) {
-			module.exports.highlightsRE = new RegExp("\\b(?:" + highlightsTokens.join("|") + ")\\b", "i");
+			module.exports.highlightsRE = new RegExp(`(?:^| |\t)(?:${highlightsTokens.join("|")})(?:\t| |$)`, "i");
 		} else {
 			module.exports.highlightsRE = null;
 		}