diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index b3247efc..153a7a15 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -273,14 +273,14 @@ HILIGHT_REC *hilight_match(SERVER_REC *server, const char *channel,
 	for (tmp = hilights; tmp != NULL; tmp = tmp->next) {
 		HILIGHT_REC *rec = tmp->data;
 
-		if (rec->priority > priority && !rec->nickmask &&
-			hilight_match_level(rec, level) && hilight_match_channel(rec, channel) &&
-			(rec->servertag == NULL ||
-			 (server != NULL && g_ascii_strcasecmp(rec->servertag, server->tag) == 0)) &&
-			hilight_match_text(rec, str, match_beg, match_end)) {
-				tmprec = rec;
-				priority = rec->priority;
-			}
+		if (rec->priority > priority && !rec->nickmask && hilight_match_level(rec, level) &&
+		    hilight_match_channel(rec, channel) &&
+		    (rec->servertag == NULL ||
+		     (server != NULL && g_ascii_strcasecmp(rec->servertag, server->tag) == 0)) &&
+		    hilight_match_text(rec, str, match_beg, match_end)) {
+			tmprec = rec;
+			priority = rec->priority;
+		}
 	}
 
 	return tmprec;
@@ -687,8 +687,8 @@ static void hilight_nick_cache(GHashTable *list, CHANNEL_REC *channel,
 		HILIGHT_REC *rec = tmp->data;
 
 		if (rec->priority > priority && rec->nickmask &&
-			hilight_match_channel(rec, channel->name) &&
-			match_wildcards(rec->text, nickmask)) {
+		    hilight_match_channel(rec, channel->name) &&
+		    match_wildcards(rec->text, nickmask)) {
 			len = strlen(rec->text);
 			if (best_match < len) {
 				priority = rec->priority;