diff --git a/core/modules/wiki.js b/core/modules/wiki.js
index 07709929f..78d914e72 100644
--- a/core/modules/wiki.js
+++ b/core/modules/wiki.js
@@ -647,13 +647,9 @@ exports.search = function(text,options) {
 		if(contentTypeInfo ? contentTypeInfo.encoding === "utf8" : true) {
 			var match = true;
 			for(var t=0; t<searchTermsRegExps.length; t++) {
-				// Search body
+				// Search title and body
 				if(match) {
-					match = searchTermsRegExps[t].test(tiddler.fields.text);
-				}
-				// Search title
-				if(match) {
-					match = searchTermsRegExps[t].test(tiddler.fields.title);
+					match = searchTermsRegExps[t].test(tiddler.fields.title) || searchTermsRegExps[t].test(tiddler.fields.text);
 				}
 			}
 			return options.invert ? !match : match;