diff --git a/src/Handler/Schedule.hs b/src/Handler/Schedule.hs
index cfe65d03d..1242a5b1b 100644
--- a/src/Handler/Schedule.hs
+++ b/src/Handler/Schedule.hs
@@ -72,10 +72,15 @@ postScheduleR = do
         offsetBtns = case viewRes of
           FormSuccess ScheduleViewWeek -> [ ScheduleOffsetDays (-7)
                                           , ScheduleOffsetDays (-1)
-                                          , ScheduleOffsetDays   0
+                                          , ScheduleOffsetNone
                                           , ScheduleOffsetDays   1
                                           , ScheduleOffsetDays   7
-                                          ] <&> (\sOffset -> ScheduleOptions{scheduleView=currentScheduleView,scheduleOffset=sOffset})
+                                          ] <&> (\sOffset -> ScheduleOptions
+                                                             { scheduleView   = currentScheduleView
+                                                             , scheduleOffset = case sOffset of
+                                                                                  ScheduleOffsetNone -> ScheduleOffsetNone
+                                                                                  _ -> currentScheduleOffset `addOffset` sOffset
+                                                             })
           _ -> mempty
 
       (offsetRess, offsetWidgets) <- fmap unzip . for offsetBtns $ \btn ->