diff --git a/calebasse/static/js/calebasse.dialog.js b/calebasse/static/js/calebasse.dialog.js
index 149e98e6..6fda6a0f 100644
--- a/calebasse/static/js/calebasse.dialog.js
+++ b/calebasse/static/js/calebasse.dialog.js
@@ -22,8 +22,7 @@ function generic_ajaxform_dialog(url, title, id, width, btn_submit_name, redirec
     height = 'auto';
   $(id).load(url,
       function () {
-        $('.datepicker-date').datepicker({dateFormat: 'd/m/yy', showOn: 'button'});
-        $('.datepicker input').datepicker({dateFormat: 'd/m/yy', showOn: 'button'});
+        init_datepickers(id);
         function onsuccess(response, status, xhr, form) {
           enable_button($('#submit-btn'));
           var parse = $(response);
diff --git a/calebasse/static/js/common.js b/calebasse/static/js/common.js
index 8d29cd8b..3a435515 100644
--- a/calebasse/static/js/common.js
+++ b/calebasse/static/js/common.js
@@ -9,5 +9,5 @@ function delete_prompt(text) {
 
 function init_datepickers(on) {
     $('.datepicker-date', on).datepicker({dateFormat: 'd/m/yy', showOn: 'button'});
-    $('.datepicker input', on).datepicker({dateFormat: 'd/m/yy', showOn: 'button'});
+    $('.datepicker input[type=text]', on).datepicker({dateFormat: 'd/m/yy', showOn: 'button'});
 }