diff --git a/README.md b/README.md
index f7650ffa6c..d66fdff49b 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ addon | version | maintainers | summary
 [sequence_reset_period](sequence_reset_period/) | 18.0.1.0.0 |  | Auto-generate yearly/monthly/weekly/daily sequence period ranges
 [server_action_mass_edit](server_action_mass_edit/) | 18.0.1.1.4 |  | Mass Editing
 [server_action_mass_edit_onchange](server_action_mass_edit_onchange/) | 18.0.1.1.1 |  | Extension of server_action_mass_edit
-[template_content_swapper](template_content_swapper/) | 18.0.1.0.0 | <a href='https://github.com/yostashiro'><img src='https://github.com/yostashiro.png' width='32' height='32' style='border-radius:50%;' alt='yostashiro'/></a> <a href='https://github.com/AungKoKoLin1997'><img src='https://github.com/AungKoKoLin1997.png' width='32' height='32' style='border-radius:50%;' alt='AungKoKoLin1997'/></a> | Template Content Swapper
+[template_content_swapper](template_content_swapper/) | 18.0.1.1.0 | <a href='https://github.com/yostashiro'><img src='https://github.com/yostashiro.png' width='32' height='32' style='border-radius:50%;' alt='yostashiro'/></a> <a href='https://github.com/AungKoKoLin1997'><img src='https://github.com/AungKoKoLin1997.png' width='32' height='32' style='border-radius:50%;' alt='AungKoKoLin1997'/></a> | Template Content Swapper
 
 [//]: # (end addons)
 
diff --git a/template_content_swapper/README.rst b/template_content_swapper/README.rst
index f29f461fd7..31d1b14971 100644
--- a/template_content_swapper/README.rst
+++ b/template_content_swapper/README.rst
@@ -11,7 +11,7 @@ Template Content Swapper
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:08a67b31885d4a29f1ca6707cc1cff1f731e59ebe74c78a3183cbef924deb2eb
+   !! source digest: sha256:0396399fe852c1e2758c288cdf0bf256b9fb9086077251ffb897a08ab9482ce9
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
diff --git a/template_content_swapper/__manifest__.py b/template_content_swapper/__manifest__.py
index c6f8ac616b..6ad0522c9b 100644
--- a/template_content_swapper/__manifest__.py
+++ b/template_content_swapper/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 {
     "name": "Template Content Swapper",
-    "version": "18.0.1.0.0",
+    "version": "18.0.1.1.0",
     "author": "Quartile, Odoo Community Association (OCA)",
     "license": "AGPL-3",
     "category": "Tools",
diff --git a/template_content_swapper/models/template_content_mapping.py b/template_content_swapper/models/template_content_mapping.py
index b4f47fac08..6e2d068737 100644
--- a/template_content_swapper/models/template_content_mapping.py
+++ b/template_content_swapper/models/template_content_mapping.py
@@ -61,6 +61,6 @@ def open_template_mapping(self):
             "type": "ir.actions.act_window",
             "name": "Template Content Mappings",
             "res_model": "template.content.mapping",
-            "view_mode": "list",
+            "view_mode": "list,form",
             "context": {"multi_lang": multi_lang},
         }
diff --git a/template_content_swapper/static/description/index.html b/template_content_swapper/static/description/index.html
index b25ebdbfe5..c0666bdabe 100644
--- a/template_content_swapper/static/description/index.html
+++ b/template_content_swapper/static/description/index.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
-<title>README.rst</title>
+<title>Template Content Swapper</title>
 <style type="text/css">
 
 /*
@@ -372,7 +372,7 @@ <h1>Template Content Swapper</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:08a67b31885d4a29f1ca6707cc1cff1f731e59ebe74c78a3183cbef924deb2eb
+!! source digest: sha256:0396399fe852c1e2758c288cdf0bf256b9fb9086077251ffb897a08ab9482ce9
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-ux/tree/18.0/template_content_swapper"><img alt="OCA/server-ux" src="https://img.shields.io/badge/github-OCA%2Fserver--ux-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-ux-18-0/server-ux-18-0-template_content_swapper"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/server-ux&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module offers a generic functionality for replacing QWeb view
diff --git a/template_content_swapper/views/template_content_mapping_views.xml b/template_content_swapper/views/template_content_mapping_views.xml
index 57bd342bf8..a653e99738 100644
--- a/template_content_swapper/views/template_content_mapping_views.xml
+++ b/template_content_swapper/views/template_content_mapping_views.xml
@@ -4,7 +4,7 @@
         <field name="name">template.content.mapping.list</field>
         <field name="model">template.content.mapping</field>
         <field name="arch" type="xml">
-            <list editable="top">
+            <list>
                 <field name="name" />
                 <field name="report_id" />
                 <field name="template_id" readonly="report_id != False" />
@@ -14,6 +14,36 @@
             </list>
         </field>
     </record>
+    <record id="view_template_content_mapping_form" model="ir.ui.view">
+        <field name="name">template.content.mapping.form</field>
+        <field name="model">template.content.mapping</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="report_id" />
+                            <field name="template_id" readonly="report_id != False" />
+                        </group>
+                        <group>
+                            <field
+                                name="lang"
+                                invisible="not context.get('multi_lang')"
+                            />
+                        </group>
+                    </group>
+                    <group>
+                        <group>
+                            <field name="content_from" />
+                        </group>
+                        <group>
+                            <field name="content_to" />
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
     <record id="view_template_content_mapping_search" model="ir.ui.view">
         <field name="name">template.content.mapping.search</field>
         <field name="model">template.content.mapping</field>