diff --git a/addons/website/models/ir_ui_view.py b/addons/website/models/ir_ui_view.py
index 7586f3abe2b..4088e1a99b4 100644
--- a/addons/website/models/ir_ui_view.py
+++ b/addons/website/models/ir_ui_view.py
@@ -426,9 +426,6 @@ class View(models.Model):
         else:
             return super(View, self).get_default_lang_code()
 
-    def redirect_to_page_manager(self):
-        return self.env["ir.actions.server"]._for_xml_id('website.action_website_pages_list')
-
     def _read_template_keys(self):
         return super(View, self)._read_template_keys() + ['website_id']
 
diff --git a/addons/website/models/website_page.py b/addons/website/models/website_page.py
index f3db86dd355..f742e24775d 100644
--- a/addons/website/models/website_page.py
+++ b/addons/website/models/website_page.py
@@ -277,14 +277,6 @@ class Page(models.Model):
         url = '/' + slugify(page_url, max_length=1024, path=True)
         return self.env['website'].with_context(website_id=website_id).get_unique_path(url)
 
-    def action_manage_website_pages(self):
-        return {
-            'name': _('Website Pages'),
-            'type': 'ir.actions.act_window',
-            'res_model': 'website.page',
-            'view_mode': 'tree',
-            'view_id': self.env.ref('website.website_pages_tree_view').id,
-        }
 
 # this is just a dummy function to be used as ormcache key
 def _cached_response():
diff --git a/addons/website/views/website_views.xml b/addons/website/views/website_views.xml
index 92787631d44..eb732bb363d 100644
--- a/addons/website/views/website_views.xml
+++ b/addons/website/views/website_views.xml
@@ -215,13 +215,11 @@
             </field>
         </record>
 
-        <record id="action_website_pages_list" model="ir.actions.server">
-            <field name="name">Website: Pages</field>
-            <field name="model_id" ref="website.model_website_page"/>
-            <field name="state">code</field>
-            <field name="code">
-                action = model.action_manage_website_pages()
-            </field>
+        <record id="action_website_pages_list" model="ir.actions.act_window">
+            <field name="name">Website Pages</field>
+            <field name="res_model">website.page</field>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="website.website_pages_tree_view"/>
         </record>
 
         <!-- ====== website.menu views =========================================
@@ -328,8 +326,8 @@
                 </field>
                 <sheet position="before">
                     <header>
-                        <button name="redirect_to_page_manager" string="Go to Page Manager"
-                            type="object" attrs="{'invisible': [('page_ids', '=', [])]}"/>
+                        <button type="action" name="website.action_website_pages_list"
+                            string="Go to Page Manager" attrs="{'invisible': [('page_ids', '=', [])]}"/>
                     </header>
                 </sheet>
                 <field name="active" position="after">