diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickRollingDateType.php b/src/Bundle/ChillMainBundle/Form/Type/PickRollingDateType.php
index 2c90379f2..5b5bff6b3 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PickRollingDateType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PickRollingDateType.php
@@ -16,6 +16,8 @@ use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
@@ -59,8 +61,13 @@ class PickRollingDateType extends AbstractType
         if (RollingDate::T_FIXED_DATE === $data->getRoll() && null === $data->getFixedDate()) {
             $context
                 ->buildViolation('rolling_date.When fixed date is selected, you must provide a date')
-                ->atPath('roll')
+                ->atPath('fixedDate')
                 ->addViolation();
         }
     }
+
+    public function buildView(FormView $view, FormInterface $form, array $options)
+    {
+        $view->vars['uniqid'] = uniqid('rollingdate-');
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/pick-rolling-date/index.js b/src/Bundle/ChillMainBundle/Resources/public/module/pick-rolling-date/index.js
new file mode 100644
index 000000000..2600ea40b
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/pick-rolling-date/index.js
@@ -0,0 +1,28 @@
+import {ShowHide} from 'ChillMainAssets/lib/show_hide/index';
+
+document.addEventListener('DOMContentLoaded', function(_e) {
+    console.log('pick-rolling-date');
+    document.querySelectorAll('div[data-rolling-date]').forEach( (picker) => {
+        const
+            roll_wrapper = picker.querySelector('div.roll-wrapper'),
+            fixed_wrapper = picker.querySelector('div.fixed-wrapper');
+
+        new ShowHide({
+            froms: [roll_wrapper],
+            container: [fixed_wrapper],
+            test: function (elems) {
+                console.log('testing');
+                console.log('elems', elems);
+                for (let el of elems) {
+                    for (let select_roll of el.querySelectorAll('select[data-roll-picker]')) {
+                        console.log('select_roll', select_roll);
+                        console.log('value', select_roll.value);
+                        return select_roll.value === 'fixed_date';
+                    }
+                }
+                return false;
+            }
+        })
+    });
+});
+
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Export/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Export/new.html.twig
index e1605a4c2..8ef4c3ad7 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Export/new.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Export/new.html.twig
@@ -22,6 +22,7 @@
 
 {% block css %}
     {{ encore_entry_link_tags('mod_pickentity_type') }}
+    {{ encore_entry_link_tags('mod_pick_rolling_date') }}
 {% endblock %}
 
 {% block js %}
@@ -30,6 +31,7 @@
     {% if export_alias == 'count_social_work_actions' %}
         {{ encore_entry_script_tags('vue_export_action_goal_result') }}
     {% endif %}
+    {{ encore_entry_script_tags('mod_pick_rolling_date') }}
 {% endblock js %}
 
 {% block content  %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
index 7ab8a4c85..33ffaaa0e 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
@@ -244,3 +244,16 @@
     <input type="hidden" {{ block('widget_attributes') }} {% if value is not empty %}value="{{ value }}" {% endif %} data-input-uniqid="{{ form.vars['uniqid'] }}"/>
     <div data-module="pick-postal-code"  data-uniqid="{{ form.vars['uniqid'] }}"></div>
 {% endblock %}
+
+{% block pick_rolling_date_widget %}
+    <div data-rolling-date="{{ form.vars['uniqid'] }}" class="row">
+        <div class="roll-wrapper col-sm-6">
+            {{ form_widget(form.roll, { 'attr': { 'data-roll-picker': 'data-roll-picker'}}) }}
+            {{ form_errors(form.roll) }}
+        </div>
+        <div class="fixed-wrapper col-sm-6">
+            {{ form_widget(form.fixedDate) }}
+            {{ form_errors(form.fixedDate) }}
+        </div>
+    </div>
+{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/chill.webpack.config.js b/src/Bundle/ChillMainBundle/chill.webpack.config.js
index 73f539739..0e4924b03 100644
--- a/src/Bundle/ChillMainBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillMainBundle/chill.webpack.config.js
@@ -71,6 +71,7 @@ module.exports = function(encore, entries)
     encore.addEntry('mod_entity_workflow_pick', __dirname + '/Resources/public/module/entity-workflow-pick/index.js');
     encore.addEntry('mod_wopi_link', __dirname + '/Resources/public/module/wopi-link/index.js');
     encore.addEntry('mod_pick_postal_code', __dirname + '/Resources/public/module/pick-postal-code/index.js');
+    encore.addEntry('mod_pick_rolling_date', __dirname + '/Resources/public/module/pick-rolling-date/index.js');
 
     // Vue entrypoints
     encore.addEntry('vue_address', __dirname + '/Resources/public/vuejs/Address/index.js');
diff --git a/src/Bundle/ChillMainBundle/translations/validators.fr.yml b/src/Bundle/ChillMainBundle/translations/validators.fr.yml
index da433ba0f..690629e44 100644
--- a/src/Bundle/ChillMainBundle/translations/validators.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/validators.fr.yml
@@ -31,3 +31,6 @@ notification:
 
 workflow:
     You must add at least one dest user or email: Indiquez au moins un destinataire ou une adresse email
+
+rolling_date:
+    When fixed date is selected, you must provide a date: Indiquez la date fixe choisie
\ No newline at end of file