diff --git a/CHANGELOG b/CHANGELOG
index eed7aec28a..aa186dc4c3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+* Add document widget on form view
 * Add full text and similarity search and FullText field
 * Add URL type to icon
 * Use instance method to get next sequence value
diff --git a/trytond/ir/ui/form.rnc b/trytond/ir/ui/form.rnc
index e35454db5b..50edba2b8b 100644
--- a/trytond/ir/ui/form.rnc
+++ b/trytond/ir/ui/form.rnc
@@ -46,6 +46,7 @@ attlist.field &=
     | "date"
     | "datetime"
     | "dict"
+    | "document"
     | "email"
     | "float"
     | "html"
diff --git a/trytond/ir/ui/form.rng b/trytond/ir/ui/form.rng
index ccf80035c2..95566a258d 100644
--- a/trytond/ir/ui/form.rng
+++ b/trytond/ir/ui/form.rng
@@ -190,6 +190,7 @@
           <value>date</value>
           <value>datetime</value>
           <value>dict</value>
+          <value>document</value>
           <value>email</value>
           <value>float</value>
           <value>html</value>
diff --git a/trytond/ir/view/attachment_form.xml b/trytond/ir/view/attachment_form.xml
index a393ef19f0..e9576f184a 100644
--- a/trytond/ir/view/attachment_form.xml
+++ b/trytond/ir/view/attachment_form.xml
@@ -2,25 +2,25 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <form col="2">
-    <group id="content" col="2" colspan="1">
-        <label name="resource"/>
-        <field name="resource"/>
-        <label name="name"/>
-        <group id="name_data" col="1" colspan="1">
-            <field name="data" filename_visible="1"/>
-            <group name="link" string="">
-                <field name="name"/>
-            </group>
+    <label name="resource"/>
+    <field name="resource"/>
+    <label name="name"/>
+    <group id="name_data" col="1" colspan="1">
+        <field name="data" filename_visible="1"/>
+        <group name="link" string="">
+            <field name="name"/>
         </group>
-        <label name="type"/>
-        <field name="type"/>
-        <label name="link"/>
-        <field name="link" widget="url"/>
-        <label name="copy_to_resources"/>
-        <field name="copy_to_resources" yexpand="0"/>
     </group>
-    <field name="data" widget="image" readonly="1"/>
+    <label name="type"/>
+    <field name="type"/>
+    <label name="link"/>
+    <field name="link" widget="url"/>
+    <label name="copy_to_resources"/>
+    <field name="copy_to_resources" yexpand="0"/>
     <notebook>
+        <page string="Document" name="data" col="1">
+            <field name="data" widget="document"/>
+        </page>
         <page name="description" col="1">
             <field name="description"/>
         </page>