diff --git a/public/src/client/search.js b/public/src/client/search.js
index 44477cd06d..900a4d1d6d 100644
--- a/public/src/client/search.js
+++ b/public/src/client/search.js
@@ -116,19 +116,13 @@ define('forum/search', ['search', 'autocomplete'], function(searchModule, autoco
 		if (!searchQuery) {
 			return;
 		}
-		var searchTerms = searchQuery.trim().split(' ');
-		var regexes = [];
-		for (var i=0; i<searchTerms.length; ++i) {
-			var regex = new RegExp(searchTerms[i], 'gi');
-			regexes.push({regex: regex, term: searchTerms[i]});
-		}
+
+		var regexStr = searchQuery.trim().split(' ').join('|');
+		var regex = new RegExp('(' + regexStr + ')', 'gi');
 
 		$('.search-result-text').each(function() {
 			var result = $(this);
-			var text = result.html();
-			for(var i=0; i<regexes.length; ++i) {
-				text = text.replace(regexes[i].regex, '<strong>' + regexes[i].term + '</strong>');
-			}
+			var text = result.html().replace(regex, '<strong>$1</strong>');
 			result.html(text).find('img').addClass('img-responsive');
 		});
 	}