diff --git a/firka/lib/ui/phone/pages/home/home_timetable.dart b/firka/lib/ui/phone/pages/home/home_timetable.dart
index 72062971..c85102d7 100644
--- a/firka/lib/ui/phone/pages/home/home_timetable.dart
+++ b/firka/lib/ui/phone/pages/home/home_timetable.dart
@@ -349,6 +349,11 @@ class _HomeTimetableScreen extends State<HomeTimetableScreen> {
                           ),
                           onTap: () async {
                             var newNow = now!.add(Duration(days: 7));
+                            now = newNow;
+                            if (now!.getMonday().getMidnight() ==
+                                timeNow().getMonday().getMidnight()) {
+                              now = timeNow();
+                            }
                             await initForWeek(newNow);
                             setState(() {
                               now = newNow;