diff --git a/timemachine/controls.py b/timemachine/controls.py
index 95d7565..a41d74d 100644
--- a/timemachine/controls.py
+++ b/timemachine/controls.py
@@ -304,9 +304,9 @@ def next_date(self):
         if self.archive is None:
             return None
         self._update()
-        for d in self.archive.dates:
-            if d > self.fmtdate():
-                return datetime.datetime.fromisoformat(d).date()
+        current_index = bisect(self.archive.dates, self.fmtdate())
+        for d in self.archive.dates[current_index:] + self.archive.dates[:current_index]:
+            return datetime.datetime.fromisoformat(d).date()
         return self.date