diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Base_getAdminToolboxEditShortcutList.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Base_getAdminToolboxEditShortcutList.xml
index 519a0e0cc0c31b35c7a84d19651d83043f42b07c..398efd2a9a92bcc05d2e7a2b692eeb527c1dcc88 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Base_getAdminToolboxEditShortcutList.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Base_getAdminToolboxEditShortcutList.xml
@@ -85,7 +85,10 @@ translateString = context.Base_translateString\n
 result = []\n
 portal_type = context.getPortalType()\n
 request = context.REQUEST\n
-current_web_section = request.current_web_section\n
+if(portal_type == \'Web Page\'):\n
+  current_web_section = context.getParent()\n
+else:\n
+  current_web_section = request.current_web_section\n
 current_web_section_pt = current_web_section.getPortalType()\n
 action_dict = request.get(\'actions\', {}) # actions needs to be renamed to action_dict\n
 exchange_action_list = action_dict.get(\'object_exchange\', [])\n
@@ -100,12 +103,12 @@ editable_absolute_url = getattr(context, \'editable_absolute_url\', absolute_url
 \n
 \n
 # Append a button to edit the current document\n
-if not request.form.get(\'editable_mode\', 0): result.append(dict(\n
+if not request.form.get(\'editable_mode\', 0): \n
+  result.append(dict(\n
   url   = "%s/view?editable_mode:int=1&%s" % (editable_absolute_url, http_parameters),\n
   icon  = context.getIcon() or \'file_icon.gif\',\n
   title = translateString("Edit ${portal_type}", mapping=dict(portal_type=portal_type)),\n
-  label = "%s Icon" % portal_type,\n
-))\n
+  label = "%s Icon" % portal_type,))\n
 else: result.append(dict(\n
   url   = "%s/view?editable_mode=&%s" % (editable_absolute_url, http_parameters),\n
   icon  = context.getIcon() or \'file_icon.gif\',\n
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/admin_toolbox.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/admin_toolbox.xml
index 4e2f17f870378037ea12ee04e3e137ee95136489..c2594480983f3bf22cdabd1d450d0ec66cb8e89a 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/admin_toolbox.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/admin_toolbox.xml
@@ -101,7 +101,7 @@
   -->\n
   <div name="adminSection" class="adminSection"\n
        tal:condition="here/isDocument | python: (portal_type in [\'Web Site\', \'Web Section\']\n
-                                             and here.WebSite_getDefaultWebPageValue())">\n
+                                             and here.WebSection_getDefaultDocumentValue() )">\n
 \n
       <h3>\n
         <span id="create_new_document_title"></span>\n