diff --git a/src/view/form.js b/src/view/form.js
index 45860832a0..a14aed3c24 100644
--- a/src/view/form.js
+++ b/src/view/form.js
@@ -1490,15 +1490,17 @@ function eval_pyson(value){
             });
             this.date.css('max-width', this._width);
             this.date.on('dp.change', this.focus_out.bind(this));
-            // We must set the overflow of the treeview containing the input to
-            // visible to prevent vertical scrollbar inherited from the auto
-            // overflow-x
+            // We must set the overflow of the treeview and modal-body
+            // containing the input to visible to prevent vertical scrollbar
+            // inherited from the auto overflow-x
             // (see http://www.w3.org/TR/css-overflow-3/#overflow-properties)
             this.date.on('dp.hide', function() {
                 this.date.closest('.treeview').css('overflow', '');
+                this.date.closest('.modal-body').css('overflow', '');
             }.bind(this));
             this.date.on('dp.show', function() {
                 this.date.closest('.treeview').css('overflow', 'visible');
+                this.date.closest('.modal-body').css('overflow', 'visible');
             }.bind(this));
             var mousetrap = new Mousetrap(this.el[0]);
 
@@ -4379,6 +4381,18 @@ function eval_pyson(value){
             });
             this.date.on('dp.change',
                     this.parent_widget.focus_out.bind(this.parent_widget));
+            // We must set the overflow of the treeview and modal-body
+            // containing the input to visible to prevent vertical scrollbar
+            // inherited from the auto overflow-x
+            // (see http://www.w3.org/TR/css-overflow-3/#overflow-properties)
+            this.date.on('dp.hide', function() {
+                this.date.closest('.treeview').css('overflow', '');
+                this.date.closest('.modal-body').css('overflow', '');
+            }.bind(this));
+            this.date.on('dp.show', function() {
+                this.date.closest('.treeview').css('overflow', 'visible');
+                this.date.closest('.modal-body').css('overflow', 'visible');
+            }.bind(this));
             var mousetrap = new Mousetrap(this.el[0]);
 
             mousetrap.bind(['enter', '='], function(e, combo) {