diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Pages/Controllers/AdminController.cs
index 4816a0996..dc5a3b9c2 100644
--- a/src/Orchard.Web/Modules/Orchard.Pages/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Pages/Controllers/AdminController.cs
@@ -142,6 +142,9 @@ namespace Orchard.Pages.Controllers {
                 case "PublishNow":
                     _pageService.Publish(model.Page.Item);
                     Services.Notifier.Information(T("Page has been published"));
+                    if (model.PromoteToHomePage) {
+                        CurrentSite.HomePage = "PageHomePageProvider;" + model.Page.Item.Id;
+                    }
                     break;
                 case "PublishLater":
                     _pageService.Publish(model.Page.Item, model.Page.Item.ScheduledPublishUtc.Value);
@@ -164,7 +167,8 @@ namespace Orchard.Pages.Controllers {
                 return new HttpUnauthorizedResult();
 
             var model = new PageEditViewModel {
-                Page = Services.ContentManager.BuildEditorModel(page)
+                Page = Services.ContentManager.BuildEditorModel(page),
+                PromoteToHomePage = CurrentSite.HomePage == "PageHomePageProvider;" + page.Id
             };
 
             return View(model);
diff --git a/src/Orchard.Web/Modules/Orchard.Pages/ViewModels/PageCreateViewModel.cs b/src/Orchard.Web/Modules/Orchard.Pages/ViewModels/PageCreateViewModel.cs
index 7d3bfea01..d78c0775c 100644
--- a/src/Orchard.Web/Modules/Orchard.Pages/ViewModels/PageCreateViewModel.cs
+++ b/src/Orchard.Web/Modules/Orchard.Pages/ViewModels/PageCreateViewModel.cs
@@ -4,5 +4,6 @@ using Orchard.Pages.Models;
 namespace Orchard.Pages.ViewModels {
     public class PageCreateViewModel : BaseViewModel {
         public ContentItemViewModel<Page> Page { get; set; }
+        public bool PromoteToHomePage { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/Create.ascx b/src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/Create.ascx
index 13a0adfe5..c3634e95f 100644
--- a/src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/Create.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/Create.ascx
@@ -4,5 +4,9 @@
 <h1><%=Html.TitleForPage(T("Add Page").ToString()) %></h1>
 <% using (Html.BeginFormAntiForgeryPost()) { %>
     <%=Html.ValidationSummary() %>
-    <%=Html.EditorForItem(m => m.Page) %><%
+    <%=Html.EditorForItem(m => m.Page) %>
+    <fieldset>
+        <%=Html.EditorFor(m => m.PromoteToHomePage) %>
+        <label for="PromoteToHomePage" class="forcheckbox"><%=_Encoded("Set as home page") %></label>
+    </fieldset><%
    } %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/Edit.ascx b/src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/Edit.ascx
index 353d83fa8..4881b5e4a 100644
--- a/src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/Edit.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/Edit.ascx
@@ -5,7 +5,8 @@
 <% using (Html.BeginFormAntiForgeryPost()) { %>
     <%=Html.ValidationSummary() %>
     <%=Html.EditorForItem(m => m.Page) %>
-    <%=Html.EditorFor(m => m.PromoteToHomePage) %>
-    <label for="PromoteToHomePage" class="forcheckbox"><%=_Encoded("Set as home page") %></label>
-    <%
+    <fieldset>
+        <%=Html.EditorFor(m => m.PromoteToHomePage) %>
+        <label for="PromoteToHomePage" class="forcheckbox"><%=_Encoded("Set as home page") %></label>
+    </fieldset><%
    } %>
\ No newline at end of file