diff --git a/src/Orchard.Web/Core/Contents/Drivers/ContentsDriver.cs b/src/Orchard.Web/Core/Contents/Drivers/ContentsDriver.cs
index 92a6b0f38..96f391850 100644
--- a/src/Orchard.Web/Core/Contents/Drivers/ContentsDriver.cs
+++ b/src/Orchard.Web/Core/Contents/Drivers/ContentsDriver.cs
@@ -17,19 +17,20 @@ namespace Orchard.Core.Contents.Drivers {
         }
 
         protected override DriverResult Editor(ContentPart part, dynamic shapeHelper) {
-            var results = new List<DriverResult> { ContentShape("Content_SaveButton", saveButton => saveButton) };
+            var results = new List<DriverResult>();
 
             if (part.TypeDefinition.Settings.GetModel<ContentTypeSettings>().Draftable) {
-                results.Add(ContentShape("Content_PublishButton", publishButton => publishButton));
-                results.Add(ContentShape("Content_UnpublishButton", unpublishButton => unpublishButton));
+                results.Add(ContentShape("Content_SaveButton", saveButton => saveButton));
             }
 
+            results.Add(ContentShape("Content_PublishButton", publishButton => publishButton));
+            results.Add(ContentShape("Content_UnpublishButton", unpublishButton => unpublishButton));
+            results.Add(ContentShape("Content_CancelButton", cancelButton => cancelButton));
+
             if (part.Id > 0) {
                 results.Add(ContentShape("Content_DeleteButton", deleteButton => deleteButton));
             }
 
-            results.Add(ContentShape("Content_CancelButton", cancelButton => cancelButton));
-
             return Combined(results.ToArray());
         }
 
diff --git a/src/Orchard.Web/Core/Contents/Views/Content.SaveButton.cshtml b/src/Orchard.Web/Core/Contents/Views/Content.SaveButton.cshtml
index feb77f87e..17d262893 100644
--- a/src/Orchard.Web/Core/Contents/Views/Content.SaveButton.cshtml
+++ b/src/Orchard.Web/Core/Contents/Views/Content.SaveButton.cshtml
@@ -1,13 +1,3 @@
-@using Orchard.ContentManagement
-@using Orchard.Core.Contents.Settings
-
-@{
-    var contentItem = Model.ContentItem as ContentItem;
-    var label = contentItem.TypeDefinition.Settings.GetModel<ContentTypeSettings>().Draftable
-        ? T("Save Draft")
-        : T("Save");
-}
-
-<fieldset class="save-button">
-    <button class="primaryAction" type="submit" name="submit.Save" value="submit.Save">@label</button>
+<fieldset class="save-button">
+    <button class="primaryAction" type="submit" name="submit.Save" value="submit.Save">@T("Save Draft")</button>
 </fieldset>