diff --git a/addons/website/views/website_views.xml b/addons/website/views/website_views.xml
index 89aba718624..00116c29371 100644
--- a/addons/website/views/website_views.xml
+++ b/addons/website/views/website_views.xml
@@ -23,22 +23,24 @@
             <field name="model">website</field>
             <field name="arch" type="xml">
                 <form string="Website Settings">
-                    <div name="domain">
-                        <group name="domain">
-                            <group>
-                                <field name="name"/>
-                                <field name="domain"/>
+                    <sheet>
+                        <div name="domain">
+                            <group name="domain">
+                                <group>
+                                    <field name="name"/>
+                                    <field name="domain"/>
+                                </group>
                             </group>
-                        </group>
-                    </div>
-                    <div name="other">
-                        <group name="other">
-                            <group>
-                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                                <field name="default_lang_id" widget="selection" groups="base.group_no_one"/>
+                        </div>
+                        <div name="other">
+                            <group name="other">
+                                <group>
+                                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                                    <field name="default_lang_id" widget="selection" groups="base.group_no_one"/>
+                                </group>
                             </group>
-                        </group>
-                    </div>
+                        </div>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/website_theme_install/models/res_config_settings.py b/addons/website_theme_install/models/res_config_settings.py
index 0597f0e795c..2d340fcb807 100644
--- a/addons/website_theme_install/models/res_config_settings.py
+++ b/addons/website_theme_install/models/res_config_settings.py
@@ -9,3 +9,8 @@ class ResConfigSettings(models.TransientModel):
         self.website_id._force()
         action = self.env.ref('website_theme_install.theme_install_kanban_action')
         return action.read()[0]
+
+    def action_website_create_new(self):
+        res = super(ResConfigSettings, self).action_website_create_new()
+        res['view_id'] = self.env.ref('website_theme_install.view_website_form_view_themes_modal').id
+        return res
diff --git a/addons/website_theme_install/views/views.xml b/addons/website_theme_install/views/views.xml
index d852beb42dc..20e8df2ca87 100644
--- a/addons/website_theme_install/views/views.xml
+++ b/addons/website_theme_install/views/views.xml
@@ -111,10 +111,11 @@ action = {
         </xpath>
     </template>
 
-    <record id="view_website_form_inherit_view_themes" model="ir.ui.view">
+    <record id="view_website_form_view_themes_modal" model="ir.ui.view">
         <field name="name">website.form</field>
         <field name="model">website</field>
         <field name="inherit_id" ref="website.view_website_form"/>
+        <field name="mode">primary</field>
         <field name="arch" type="xml">
             <xpath expr="//form" position='inside'>
                 <footer>