diff --git a/app/assets/javascripts/admin-manifest.coffee b/app/assets/javascripts/admin-manifest.coffee
index 7e7220b4c..23295cb0c 100644
--- a/app/assets/javascripts/admin-manifest.coffee
+++ b/app/assets/javascripts/admin-manifest.coffee
@@ -9,6 +9,7 @@
 #= require jquery-ui/datepicker
 #= require select2
 #= require jquery.doubleScroll
+#= require datepicker
 #= require admin/application
 #= require admin/app
 #= require_tree ./admin
diff --git a/app/assets/javascripts/admin/datepicker.js b/app/assets/javascripts/admin/datepicker.js
deleted file mode 100644
index 43029c117..000000000
--- a/app/assets/javascripts/admin/datepicker.js
+++ /dev/null
@@ -1,3 +0,0 @@
-$('.datepicker').datepicker({
-    dateFormat: 'yy-mm-dd'
-});
diff --git a/app/assets/javascripts/datepicker.js b/app/assets/javascripts/datepicker.js
new file mode 100644
index 000000000..df7d2a5d0
--- /dev/null
+++ b/app/assets/javascripts/datepicker.js
@@ -0,0 +1,21 @@
+(function () {
+    $.datepicker.setDefaults({
+        changeMonth: true,
+        changeYear: true,
+        duration: 'fast',
+        firstDay: 1, // Monday
+        dateFormat: 'yy-mm-dd',
+    });
+
+    function attachDatePicker() {
+        var dateFields = $('.datepicker');
+        dateFields.datepicker();
+    }
+
+    // For turbolinks
+    document.addEventListener('page:change', function () {
+        attachDatePicker();
+    });
+
+    attachDatePicker();
+})();
diff --git a/app/assets/javascripts/registrant-manifest.coffee b/app/assets/javascripts/registrant-manifest.coffee
index 50d127bc5..b8ba84bba 100644
--- a/app/assets/javascripts/registrant-manifest.coffee
+++ b/app/assets/javascripts/registrant-manifest.coffee
@@ -8,7 +8,6 @@
 #= require shared/jquery.validate.bootstrap
 #= require jquery-ui/datepicker
 #= require select2
-
+#= require datepicker
 #= require shared/general
-
 #= require registrar/application
diff --git a/app/assets/javascripts/registrar-manifest.coffee b/app/assets/javascripts/registrar-manifest.coffee
index 86b7b4060..c5d8918b6 100644
--- a/app/assets/javascripts/registrar-manifest.coffee
+++ b/app/assets/javascripts/registrar-manifest.coffee
@@ -6,8 +6,7 @@
 #= require jquery.nested_attributes
 #= require jquery-ui/datepicker
 #= require select2
-
+#= require datepicker
 #= require shared/general
-
 #= require registrar/autocomplete
 #= require registrar/application
diff --git a/app/assets/javascripts/shared/general.coffee b/app/assets/javascripts/shared/general.coffee
index 17b4f5725..05d5ce8ed 100644
--- a/app/assets/javascripts/shared/general.coffee
+++ b/app/assets/javascripts/shared/general.coffee
@@ -21,10 +21,6 @@ $(document).on 'page:change', ->
   tomorrow = new Date(today)
   tomorrow.setDate(today.getDate() + 1)
 
-  $('.datepicker').datepicker(
-    dateFormat: "yy-mm-dd"
-  )
-
   if $('.js-combobox').length
     $('.js-combobox').select2
       width: "100%"