diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index eca9a0d48c..a158dd4074 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -892,6 +892,13 @@ class phpbb_template_filter extends php_user_filter
 				->extension_directory("/styles/all/template")
 				->get_files();
 
+			$files = array_merge($files, $finder
+				->extension_prefix($location)
+				->extension_suffix('.html')
+				// XXX is this safe?
+				->extension_directory("/styles/" . $this->template_name . "/template")
+				->get_files());
+
 			$all_compiled = '';
 			foreach ($files as $file)
 			{