diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 971beb20..ca60c906 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -904,8 +904,9 @@ class Menu(models.Model):
     page_id = fields.Many2one('website.page', 'Related Page')
     new_window = fields.Boolean('New Window')
     sequence = fields.Integer(default=_default_sequence)
-    website_id = fields.Many2one('website', 'Website')  # TODO: support multiwebsite once done for ir.ui.views
-    parent_id = fields.Many2one('website.menu', 'Parent Menu', index=True, ondelete="cascade")
+    website_id = fields.Many2one('website', 'Website', required=True,
+                                 default=lambda self: self.env.ref('website.default_website'))  # TODO: support multiwebsite once done for ir.ui.views
+    parent_id = fields.Many2one('website.menu', 'Parent Menu', index=True, ondelete="cascade", domain="[('website_id','=', website_id)]")
     child_id = fields.One2many('website.menu', 'parent_id', string='Child Menus')
     parent_left = fields.Integer('Parent Left', index=True)
     parent_right = fields.Integer('Parent Rigth', index=True)
diff --git a/addons/website/views/website_views.xml b/addons/website/views/website_views.xml
index 1e4ba71f..da41c716 100644
--- a/addons/website/views/website_views.xml
+++ b/addons/website/views/website_views.xml
@@ -169,10 +169,31 @@
         <record id="action_website_menu" model="ir.actions.act_window">
             <field name="name">Website Menu</field>
             <field name="res_model">website.menu</field>
-            <field name="view_mode">list</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
             <field name="context">{'search_default_my_websites':1}</field>
         </record>
 
+        <record id="menu_from" model="ir.ui.view">
+            <field name="name">website.menu.form</field>
+            <field name="model">website.menu</field>
+            <field name="arch" type="xml">
+                <form string="Website menu">
+                    <sheet>
+                        <group>
+                            <field name="name"/>
+                            <field name="url"/>
+                        </group>
+                        <group>
+                            <field name="website_id" options="{'no_create': True}"/>
+                            <field name="new_window"/>
+                            <field name="parent_id"/>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
         <record id="menu_tree" model="ir.ui.view">
             <field name="name">website.menu.tree</field>
             <field name="model">website.menu</field>