diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index c3c31f99ee..2e59acf3cc 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -453,7 +453,7 @@ return array(
     'rsrc/js/core/behavior-device.js' => 'a205cf28',
     'rsrc/js/core/behavior-drag-and-drop-textarea.js' => '6d49590e',
     'rsrc/js/core/behavior-error-log.js' => '6882e80a',
-    'rsrc/js/core/behavior-fancy-datepicker.js' => '665cf6ac',
+    'rsrc/js/core/behavior-fancy-datepicker.js' => '8ae55229',
     'rsrc/js/core/behavior-file-tree.js' => '88236f00',
     'rsrc/js/core/behavior-form.js' => '5c54cbf3',
     'rsrc/js/core/behavior-gesture.js' => '3ab51e2c',
@@ -586,7 +586,7 @@ return array(
     'javelin-behavior-durable-column' => 'c72aa091',
     'javelin-behavior-error-log' => '6882e80a',
     'javelin-behavior-event-all-day' => '38dcf3c8',
-    'javelin-behavior-fancy-datepicker' => '665cf6ac',
+    'javelin-behavior-fancy-datepicker' => '8ae55229',
     'javelin-behavior-global-drag-and-drop' => 'c8e57404',
     'javelin-behavior-herald-rule-editor' => '7ebaeed3',
     'javelin-behavior-high-security-warning' => 'a464fe03',
@@ -1294,13 +1294,6 @@ return array(
       'javelin-vector',
       'differential-inline-comment-editor',
     ),
-    '665cf6ac' => array(
-      'javelin-behavior',
-      'javelin-util',
-      'javelin-dom',
-      'javelin-stratcom',
-      'javelin-vector',
-    ),
     '6882e80a' => array(
       'javelin-dom',
     ),
@@ -1500,6 +1493,13 @@ return array(
       'javelin-install',
       'javelin-dom',
     ),
+    '8ae55229' => array(
+      'javelin-behavior',
+      'javelin-util',
+      'javelin-dom',
+      'javelin-stratcom',
+      'javelin-vector',
+    ),
     '8b3fd187' => array(
       'javelin-install',
       'javelin-util',
diff --git a/webroot/rsrc/js/core/behavior-fancy-datepicker.js b/webroot/rsrc/js/core/behavior-fancy-datepicker.js
index c56d005dd8..4c58974fc5 100644
--- a/webroot/rsrc/js/core/behavior-fancy-datepicker.js
+++ b/webroot/rsrc/js/core/behavior-fancy-datepicker.js
@@ -300,10 +300,10 @@ JX.behavior('fancy-datepicker', function(config, statics) {
     // Render the calendar itself. NOTE: Javascript uses 0-based month indexes
     // while we use 1-based month indexes, so we have to adjust for that.
     var days = [];
-    var start = new Date(
+    var start = (new Date(
       valid_date.getYear() + 1900,
       valid_date.getMonth(),
-      1).getDay() - week_start;
+      1).getDay() - week_start + 7) % 7;
 
     while (start--) {
       days.push(cell('', null, false, 'day-placeholder'));