--- a/mobile/android/base/java/org/mozilla/gecko/widget/DateTimePicker.java
+++ b/mobile/android/base/java/org/mozilla/gecko/widget/DateTimePicker.java
@@ -342,17 +342,18 @@ public class DateTimePicker extends Fram
 
         mMonthSpinner = setupSpinner(R.id.month, 1,
                                      mTempDate.get(Calendar.MONTH) + 1); // Month is 0-based
         mMonthSpinner.setFormatter(TWO_DIGIT_FORMATTER);
         mMonthSpinner.setDisplayedValues(mShortMonths);
         mMonthSpinnerInput = (EditText) mMonthSpinner.getChildAt(1);
 
         mWeekSpinner = setupSpinner(R.id.week, 1,
-                                    mTempDate.get(Calendar.WEEK_OF_YEAR));
+                                    mTempDate.getActualMaximum(Calendar.WEEK_OF_YEAR));
+        mWeekSpinner.setValue(mTempDate.get(Calendar.WEEK_OF_YEAR));
         mWeekSpinner.setFormatter(TWO_DIGIT_FORMATTER);
         mWeekSpinnerInput = (EditText) mWeekSpinner.getChildAt(1);
 
         mYearSpinner = setupSpinner(R.id.year, DEFAULT_START_YEAR,
                                     DEFAULT_END_YEAR);
         mYearSpinnerInput = (EditText) mYearSpinner.getChildAt(1);
 
         mAMPMSpinner = setupSpinner(R.id.ampm, 0, 1);