diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 82a359c15c..5c117953dd 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -998,6 +998,15 @@ for($i = 0; $i < $total_posts; $i++)
 	// output
 	//
 
+	//
+	// Highlight active words (primarily for search)
+	//
+	if( $highlight_active )
+	{
+		$message = preg_replace($highlight_match, $highlight_replace, $message);
+	}
+
+
 	//
 	// If the board has HTML off but the post has HTML
 	// on then we process it, else leave it alone
@@ -1037,14 +1046,6 @@ for($i = 0; $i < $total_posts; $i++)
 	}
 	$message = make_clickable($message);
 
-	//
-	// Highlight active words (primarily for search)
-	//
-	if( $highlight_active )
-	{
-		$message = preg_replace($highlight_match, $highlight_replace, $message);
-	}
-
 	//
 	// Replace naughty words
 	//