diff --git a/umbraco/presentation/umbraco/editContent.aspx.cs b/umbraco/presentation/umbraco/editContent.aspx.cs
index 6683e62573..e963b623b4 100644
--- a/umbraco/presentation/umbraco/editContent.aspx.cs
+++ b/umbraco/presentation/umbraco/editContent.aspx.cs
@@ -37,7 +37,7 @@ namespace umbraco.cms.presentation
         controls.ContentControl cControl;
 
         DropDownList ddlDefaultTemplate = new DropDownList();
-        
+
         uicontrols.Pane publishProps = new uicontrols.Pane();
         uicontrols.Pane linkProps = new uicontrols.Pane();
 
@@ -133,8 +133,8 @@ namespace umbraco.cms.presentation
             cms.businesslogic.web.DocumentType DocumentType = new cms.businesslogic.web.DocumentType(_document.ContentType.Id);
             cControl.PropertiesPane.addProperty(ui.Text("documentType"), new LiteralControl(DocumentType.Text));
 
-           
-           
+
+
 
             //template picker
             cControl.PropertiesPane.addProperty(ui.Text("template"), template);
@@ -281,7 +281,7 @@ namespace umbraco.cms.presentation
                 }
             }
 
-          
+
 
 
             // Run Handler				
@@ -316,7 +316,7 @@ namespace umbraco.cms.presentation
 
                     if (_document.PublishWithResult(base.getUser()))
                     {
-                        
+
                         ClientTools.ShowSpeechBubble(speechBubbleIcon.save, ui.Text("speechBubbles", "editContentPublishedHeader", null), ui.Text("speechBubbles", "editContentPublishedText", null));
                         library.UpdateDocumentCache(_document.Id);
 
@@ -383,7 +383,13 @@ namespace umbraco.cms.presentation
                                     if (library.NiceUrl(int.Parse(s)) == "")
                                         tempLink = "<em>N/A</em>";
                                     else if (int.Parse(s) != _document.Id)
-                                        tempLink = "http://" + domains[i].Name + "/" + currentLink.Replace(library.NiceUrl(int.Parse(s)).Replace(".aspx", ""), "").Substring(1);
+                                    {
+                                        string niceUrl = currentLink.Replace(library.NiceUrl(int.Parse(s)).Replace(".aspx", ""), "");
+                                        if (!niceUrl.StartsWith("/"))
+                                            niceUrl = "/" + niceUrl;
+
+                                        tempLink = "http://" + domains[i].Name + niceUrl;
+                                    }
                                     else
                                         tempLink = "http://" + domains[i].Name;