diff --git a/astrid/src/com/todoroo/astrid/ui/NumberPicker.java b/astrid/src/com/todoroo/astrid/ui/NumberPicker.java
index acd4677d5..374ff6b98 100644
--- a/astrid/src/com/todoroo/astrid/ui/NumberPicker.java
+++ b/astrid/src/com/todoroo/astrid/ui/NumberPicker.java
@@ -257,10 +257,10 @@ public class NumberPicker extends LinearLayout implements OnClickListener,
         current = notifyChange(current);
 
         // Wrap around the values if we go past the start or end
-        if (current > mEnd) {
-            current = mStart;
+        if (current > mEnd) {;
+            current = mStart + (current - mEnd) - 1;
         } else if (current < mStart) {
-            current = mEnd;
+            current = mEnd - (mStart - current) + 1;
         }
         mPrevious = mCurrent;
         mCurrent = current;