diff --git a/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs b/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs
index 6287469773..3ead9903c4 100644
--- a/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs
+++ b/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs
@@ -56,14 +56,19 @@ namespace Umbraco.Web.UI.Umbraco.Settings.Views
 
 					var li = new ListItem(t.Text, t.Id.ToString());
 					li.Attributes.Add("id", t.Alias.Replace(" ", ""));
-
-					if (t.Id == _template.MasterTemplate)
-						selectedTemplate = t.Alias.Replace(" ", "");
-
-					MasterTemplate.Items.Add(li);
+                    MasterTemplate.Items.Add(li);
 				}
 
-				MasterTemplate.SelectedValue = selectedTemplate;
+                try
+                {
+                    if (_template.MasterTemplate > 0)
+                        MasterTemplate.SelectedValue = _template.MasterTemplate.ToString();
+                }
+                catch (Exception ex)
+                {
+                }
+
+			    MasterTemplate.SelectedValue = selectedTemplate;
 
 				NameTxt.Text = _template.GetRawText();
 				AliasTxt.Text = _template.Alias;
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs
index 97a6c11a0f..f5e7ac9642 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs
@@ -36,12 +36,7 @@ namespace umbraco
 
         protected override void CreateRootNode(ref XmlTreeNode rootNode)
         {
-            if (!Umbraco.Core.Configuration.UmbracoSettings.EnableMvcSupport)  
-			    rootNode.NodeType = "init" + TreeAlias; 
-            else
-                rootNode.NodeType = "initviews";
-                
-            
+            rootNode.NodeType = "init" + TreeAlias; 
 			rootNode.NodeID = "init";
         }
 
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs
index 73dff11fff..026cb7d137 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs
@@ -50,19 +50,7 @@ namespace umbraco.cms.presentation.settings
                     if (t.Id != _template.Id)
                     {
                         var li = new ListItem(t.Text, t.Id.ToString());
-
                         li.Attributes.Add("id", t.Alias.Replace(" ", ""));
-
-                        if (t.Id == _template.MasterTemplate)
-                        {
-                            try
-                            {
-                                li.Selected = true;
-                            }
-                            catch
-                            {
-                            }
-                        }
                         MasterTemplate.Items.Add(li);
                     }
                 }
@@ -71,6 +59,14 @@ namespace umbraco.cms.presentation.settings
                 AliasTxt.Text = _template.Alias;
                 editorSource.Text = _template.Design;
 
+                try
+                {
+                    if (_template.MasterTemplate > 0)
+                        MasterTemplate.SelectedValue = _template.MasterTemplate.ToString();
+                }
+                catch (Exception ex)
+                {
+                }
 
                 ClientTools
                     .SetActiveTreeType(TreeDefinitionCollection.Instance.FindTree<loadTemplates>().Tree.Alias)