diff --git a/src/Orchard.Web/Core/Contents/Views/Parts.Contents.Publish.SummaryAdmin.cshtml b/src/Orchard.Web/Core/Contents/Views/Parts.Contents.Publish.SummaryAdmin.cshtml
index db5fb23e1..3e5ca538e 100644
--- a/src/Orchard.Web/Core/Contents/Views/Parts.Contents.Publish.SummaryAdmin.cshtml
+++ b/src/Orchard.Web/Core/Contents/Views/Parts.Contents.Publish.SummaryAdmin.cshtml
@@ -25,9 +25,11 @@
     }
     @if (authorizedToEdit) {
         if (hasPublished) {
-            <li class="action-link">
-                @Html.ItemEditLink(T("Edit").Text, contentItem)
-            </li>
+            if (!hasDraft) { 
+                <li class="action-link">
+                    @Html.ItemEditLink(T("Edit").Text, contentItem)
+                </li>
+            }
             <li class="action-link">
                 @Html.ActionLink(T("Clone").Text, "Clone", "Admin", new { Id = contentItem.Id, ReturnUrl = Request.ToUrlString(), Area = "Contents" }, new { itemprop = "UnsafeUrl" })
             </li>
@@ -58,6 +60,10 @@
             </li>
         }
 
+        <li class="action-link">
+            @Html.ItemEditLink(T("Edit").Text, contentItem)
+        </li>
+
         @if (hasDraft && authorizedToPublish) {
             <li class="action-link">
                 @Html.ActionLink(T("Publish").Text, "Publish", "Admin", new { area = "Contents", id = contentItem.Id, returnUrl = Request.ToUrlString() }, new { itemprop = "UnsafeUrl" })