diff --git a/CHANGELOG b/CHANGELOG
index fb24e612f1..58e11338ba 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+* Add width and height attributes on calendar view
 * Add default database name configuration
 * Add retry option to report convert
 * Add depends fields on view_attributes
diff --git a/doc/topics/views/index.rst b/doc/topics/views/index.rst
index 9b9c35734b..06c10e6194 100644
--- a/doc/topics/views/index.rst
+++ b/doc/topics/views/index.rst
@@ -843,6 +843,10 @@ Each calendar view must start with this tag.
     * ``background_color``: An optional field name that contains the background
       color for the event. The default value is `lightblue`.
 
+    * ``width``: The minimum width the calendar should request, use -1 to unset.
+
+    * ``height``: The minimum height the calendar should request, use -1 to unset.
+
 field
 ^^^^^
 
diff --git a/trytond/ir/ui/calendar.rnc b/trytond/ir/ui/calendar.rnc
index 74f6e2d05a..1af4fb3f78 100644
--- a/trytond/ir/ui/calendar.rnc
+++ b/trytond/ir/ui/calendar.rnc
@@ -14,6 +14,10 @@ attlist.calendar &=
    [ a:defaultValue = "black" ] attribute color { text }?
 attlist.calendar &=
    [ a:defaultValue = "lightblue" ] attribute background_color { text }?
+attlist.calendar &=
+  attribute width { text }?
+attlist.calendar &=
+  attribute height { text }?
 field = element field { attlist.field, empty }
 attlist.field &= attribute name { text }
 data = element data { attlist.data, xpath* }
diff --git a/trytond/ir/ui/calendar.rng b/trytond/ir/ui/calendar.rng
index 92f0de6fc8..0e5b31d40a 100644
--- a/trytond/ir/ui/calendar.rng
+++ b/trytond/ir/ui/calendar.rng
@@ -63,6 +63,22 @@
       </attribute>
     </optional>
   </define>
+  <define name="attlist.calendar" combine="interleave">
+    <optional>
+      <attribute>
+        <name ns="">width</name>
+        <text/>
+      </attribute>
+    </optional>
+  </define>
+  <define name="attlist.calendar" combine="interleave">
+    <optional>
+      <attribute>
+        <name ns="">height</name>
+        <text/>
+      </attribute>
+    </optional>
+  </define>
   <define name="field">
     <element>
       <name ns="">field</name>