diff --git a/umbraco/presentation/umbraco/editContent.aspx.cs b/umbraco/presentation/umbraco/editContent.aspx.cs
index 87c6ae31d4..de41134c62 100644
--- a/umbraco/presentation/umbraco/editContent.aspx.cs
+++ b/umbraco/presentation/umbraco/editContent.aspx.cs
@@ -382,7 +382,9 @@ namespace umbraco.cms.presentation
tempLink = "N/A";
else if (int.Parse(s) != _document.Id)
{
- string niceUrl = currentLink.Replace(library.NiceUrl(int.Parse(s)).Replace(".aspx", ""), "");
+ string tempNiceUrl = library.NiceUrl(int.Parse(s));
+
+ string niceUrl = tempNiceUrl != "/" ? currentLink.Replace(tempNiceUrl.Replace(".aspx", ""), "") : currentLink;
if (!niceUrl.StartsWith("/"))
niceUrl = "/" + niceUrl;
diff --git a/umbraco/presentation/web.config b/umbraco/presentation/web.config
index b805ee0b5c..ed274b95b8 100644
--- a/umbraco/presentation/web.config
+++ b/umbraco/presentation/web.config
@@ -39,8 +39,8 @@
-
-
+
+