diff --git a/src/Umbraco.Web/umbraco.presentation/default.aspx.cs b/src/Umbraco.Web/umbraco.presentation/default.aspx.cs
index 0dd9e7067a..40e69171fd 100644
--- a/src/Umbraco.Web/umbraco.presentation/default.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/default.aspx.cs
@@ -61,8 +61,7 @@ namespace umbraco
 				//if we are cancelling then return and don't proceed
 				if (args.Cancel) return;
 
-				var templatePath = SystemDirectories.Masterpages + "/" + _docRequest.Template.Alias.Replace(" ", "") + ".master"; // fixme - should be in .Template!
-				this.MasterPageFile = templatePath; // set the template
+				this.MasterPageFile = template.GetMasterPageName(_upage.Template);
 
 				// reset the friendly path so it's used by forms, etc.			
 				Context.RewritePath(UmbracoContext.Current.RequestUrl.PathAndQuery);