diff --git a/.hgsubstate b/.hgsubstate
index 34a783bdd..879e18105 100644
--- a/.hgsubstate
+++ b/.hgsubstate
@@ -9,4 +9,4 @@ cfc264d41c1d299c104d76c5032d8ffee3047dcd src/Orchard.Web/Modules/Orchard.Rules
 f6fecd1702066225a84a482ac029e3e6daff38f3 src/Orchard.Web/Modules/Orchard.ViewPermissions
 4ed51e0e76c2aacc2de90ce9984fd00cfdfae2ce src/orchard.web/Modules/Orchard.Alias
 29857523c5275b8566ee3a6f4ba2a3d641e7fa0c src/orchard.web/Modules/Orchard.Projections
-5a25640f15b1a5a336e424324f1c4baf0a8ee73c src/orchard.web/modules/Orchard.Fields
+dd54e3ffe5199d162cad97772ce40dccaf613c3f src/orchard.web/modules/Orchard.Fields
diff --git a/src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts.ContentMenuItem.Edit.cshtml b/src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts.ContentMenuItem.Edit.cshtml
index d5da2e12e..ca9defb2c 100644
--- a/src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts.ContentMenuItem.Edit.cshtml
+++ b/src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts.ContentMenuItem.Edit.cshtml
@@ -1,22 +1,36 @@
 @model Orchard.Core.Navigation.ViewModels.ContentMenuItemEditViewModel
 @{
     Script.Require("ContentPicker").AtFoot();
+    var title = Model.Part.Content == null ? new HtmlString(T("Empty").Text) : Html.ItemDisplayText(Model.Part.Content);
 }
 <fieldset>
-<label for="@Html.FieldIdFor(m => m.ContentItemId)">@T("Content Item")</label>
-    @Html.TextBoxFor(m => m.ContentItemId, new { @class = "small text",  @readonly = "readonly" }) <span id="btn-@Html.FieldIdFor(m => m.ContentItemId)" class="button">@T("Browse")</span>
+    <label>@T("Content Item")</label>
+    <span id="title-@Html.FieldIdFor(m => m.ContentItemId)" class="content-picker-title">@title</span>
+    <span id="btn-@Html.FieldIdFor(m => m.ContentItemId)" class="button">@T("Browse")</span>
+
+    @Html.HiddenFor(m => m.ContentItemId)
     <span class="hint">@T("Select the Content Item to display in the menu.")</span>
 </fieldset>
 
 @using(Script.Foot()) {
 <script type="text/javascript">
 //<![CDATA[
-    jQuery('#btn-@Html.FieldIdFor(m => m.ContentItemId)').click(function () {
+    jQuery('#btn-@Html.FieldIdFor(m => m.ContentItemId)').click(function() {
         jQuery('#btn-@Html.FieldIdFor(m => m.ContentItemId)').trigger("orchard-admin-contentpicker-open", {
-            callback: function (data) {
+            callback: function(data) {
 
                 var id = data.id;
                 jQuery('#@Html.FieldIdFor(m => m.ContentItemId)').val(id);
+
+                var title = data.title;
+                if (title && title.length > 0) {
+                    jQuery('#title-@Html.FieldIdFor(m => m.ContentItemId)').text(title);
+
+                    var menuText = jQuery('#MenuText');
+                    if (menuText.length > 0) {
+                        menuText.val(title);
+                    }
+                }
             }
         });
     });