diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheetProperty.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheetProperty.cs
index 1be4d03f58..197c52925e 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheetProperty.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheetProperty.cs
@@ -58,12 +58,12 @@ namespace umbraco
             {
                 var sheetId = sheet.Path.TrimEnd(".css");
                 var xNode = XmlTreeNode.Create(this);
-                xNode.NodeID = sheetId + "_" + prop.Name;
+                xNode.NodeID = sheetId + "_" + HttpUtility.UrlEncode(prop.Name);
                 xNode.Text = prop.Name;
                 xNode.Action = "javascript:openStylesheetProperty('" +
                     //Needs to be escaped for JS
                     HttpUtility.UrlEncode(sheet.Path) + 
-                    "','" + prop.Name + "');";
+                    "','" + HttpUtility.UrlEncode(prop.Name) + "');";
                 xNode.Icon = "icon-brackets";
                 xNode.OpenIcon = "icon-brackets";
 
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/stylesheetPropertyTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/stylesheetPropertyTasks.cs
index 76f1b83190..d1d607a7d8 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/stylesheetPropertyTasks.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/stylesheetPropertyTasks.cs
@@ -26,7 +26,7 @@ namespace umbraco
             s.AddProperty(new StylesheetProperty(Alias, "." + Alias.ToSafeAlias(), ""));
             Umbraco.Core.ApplicationContext.Current.Services.FileService.SaveStylesheet(s);
 
-            _returnUrl = string.Format("settings/stylesheet/property/EditStyleSheetProperty.aspx?id={0}&prop={1}", HttpUtility.UrlEncode(s.Path), Alias);
+            _returnUrl = string.Format("settings/stylesheet/property/EditStyleSheetProperty.aspx?id={0}&prop={1}", HttpUtility.UrlEncode(s.Path), HttpUtility.UrlEncode(Alias));
             return true;
         }