diff --git a/public/src/templates.js b/public/src/templates.js
index e4dbb0f69a..0018b1e974 100644
--- a/public/src/templates.js
+++ b/public/src/templates.js
@@ -281,7 +281,7 @@
 		}
 
 		function makeRegex(block) {
-			return new RegExp("<!--[\\s]*BEGIN " + block + "[\\s]*-->[\\s\\S]*<!--[\\s]*END " + block + "[\\s]*-->", 'g');
+			return new RegExp("<!--[\\s]*BEGIN " + block + "[\\s]*-->([\\s\\S]*?)<!--[\\s]*END " + block + "[\\s]*-->", 'g');
 		}
 
 		function makeConditionalRegex(block) {