diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index 95a4ec5c76..abee32c8f7 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -209,7 +209,7 @@ class phpbb_template_filter extends php_user_filter
 
 		*/
 
-		$data = preg_replace('#\?\>([\r\n])#', '?>\1\1', $data);
+		$data = preg_replace('~(?<!^)(<\?php.+(?<!/\*\*/)\?>)$~m', "$1\n", $data);
 		$data = str_replace('/**/?>', "?>\n", $data);
 		$data = str_replace('?><?php', '', $data);
 		return $data;