diff --git a/app/assets/javascripts/advanced_search.js b/app/assets/javascripts/advanced_search.js
index 3f069747e..51b257ee7 100644
--- a/app/assets/javascripts/advanced_search.js
+++ b/app/assets/javascripts/advanced_search.js
@@ -17,30 +17,7 @@
         $(".js-calendar").datepicker("option", "disabled", true);
       }
     },
-    init_calendar: function() {
-      var locale;
-      locale = $("#js-locale").data("current-locale");
-      $(".js-calendar").datepicker({
-        maxDate: "+0d"
-      });
-      $(".js-calendar-full").datepicker();
-
-      if (!App.AdvancedSearch.browser_supports_date_field()) {
-        $("input[type='date']").datepicker();
-      }
-
-      $.datepicker.setDefaults($.datepicker.regional[locale]);
-      $.datepicker.setDefaults({ dateFormat: "dd/mm/yy" });
-    },
-    browser_supports_date_field: function() {
-      var datefield;
-
-      datefield = document.createElement("input");
-      datefield.setAttribute("type", "date");
-      return datefield.type === "date";
-    },
     initialize: function() {
-      App.AdvancedSearch.init_calendar();
       if (App.AdvancedSearch.advanced_search_terms()) {
         $("#js-advanced-search").show();
         App.AdvancedSearch.toggle_date_options();
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index e9d05e280..e5fc6da7c 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -163,6 +163,7 @@ var initialize_modules = function() {
     App.ColumnsSelector.initialize();
   }
   App.BudgetEditAssociations.initialize();
+  App.Datepicker.initialize();
 };
 
 var destroy_non_idempotent_modules = function() {
diff --git a/app/assets/javascripts/datepicker.js b/app/assets/javascripts/datepicker.js
index b44fa8e58..8299833cd 100644
--- a/app/assets/javascripts/datepicker.js
+++ b/app/assets/javascripts/datepicker.js
@@ -15,6 +15,21 @@
 (function() {
   "use strict";
   App.Datepicker = {
+    initialize: function() {
+      var locale;
+      locale = $("#js-locale").data("current-locale");
+      $(".js-calendar").datepicker({
+        maxDate: "+0d"
+      });
+      $(".js-calendar-full").datepicker();
+
+      if (!App.Datepicker.browser_supports_date_field()) {
+        $("input[type='date']").datepicker();
+      }
+
+      $.datepicker.setDefaults($.datepicker.regional[locale]);
+      $.datepicker.setDefaults({ dateFormat: "dd/mm/yy" });
+    },
     destroy: function() {
       $.datepicker.dpDiv.remove();
 
@@ -22,6 +37,13 @@
         $(input).datepicker("hide");
         $(input).datepicker("destroy");
       });
+    },
+    browser_supports_date_field: function() {
+      var datefield;
+
+      datefield = document.createElement("input");
+      datefield.setAttribute("type", "date");
+      return datefield.type === "date";
     }
   };