diff --git a/frappe/website/page_controllers/template_page.py b/frappe/website/page_controllers/template_page.py
index 7d1f94bcc5..b050a62bad 100644
--- a/frappe/website/page_controllers/template_page.py
+++ b/frappe/website/page_controllers/template_page.py
@@ -86,16 +86,9 @@ class TemplatePage(BaseTemplatePage):
 	def setup_template(self):
 		'''Setup template source, frontmatter and markdown conversion'''
 		self.source = self.get_raw_template()
-
-		if self.template_path.endswith(('.md', '.html')):
-			self.extract_frontmatter()
-
+		self.extract_frontmatter()
 		self.convert_from_markdown()
 
-		if self.extends_template():
-			self.context.base_template_path = self.context.base_template_path
-		# TODO: setup index.txt ?
-
 	def update_context(self):
 		self.set_page_properties()
 		self.set_properties_from_source()
@@ -166,7 +159,7 @@ class TemplatePage(BaseTemplatePage):
 		return html
 
 	def extends_template(self):
-		return (self.template_path.endswith(('.html', '.md', ))
+		return (self.template_path.endswith(('.html', '.md'))
 			and ('{%- extends' in self.source
 				or '{% extends' in self.source))
 
@@ -188,6 +181,9 @@ class TemplatePage(BaseTemplatePage):
 			return f.read()
 
 	def extract_frontmatter(self):
+		if not self.template_path.endswith(('.md', '.html')):
+			return
+
 		try:
 			# values will be used to update self
 			res = get_frontmatter(self.source)