diff --git a/src/components/date-selector.vue b/src/components/date-selector.vue
index 5c3c784..46c0485 100644
--- a/src/components/date-selector.vue
+++ b/src/components/date-selector.vue
@@ -3,13 +3,24 @@ import { selectedDate, selectedDay } from "../store";
 import { dayNames } from "../definitions";
 import dayjs from "dayjs";
 import ArrowIcon from "./icons/arrow-icon.vue";
+
+function nextDay() {
+  var newDate = dayjs(selectedDate.value).add(1, "day");
+  // Skip weekend
+  if (newDate.day() == 6) newDate = newDate.add(2, "day");
+  selectedDate.value = newDate.toDate();
+}
+function previousDay() {
+  var newDate = dayjs(selectedDate.value).subtract(1, "day");
+  // Skip weekend
+  if (newDate.day() == 0) newDate = newDate.subtract(2, "day");
+  selectedDate.value = newDate.toDate();
+}
 </script>
 
 <template>
   <div class="selector">
-    <ArrowIcon
-      @click="selectedDate = dayjs(selectedDate).subtract(1, 'day').toDate()"
-    />
+    <ArrowIcon @click="previousDay" />
     <span
       class="day"
       @click="selectedDate = new Date(new Date().setUTCHours(0, 0, 0, 0))"
@@ -17,10 +28,7 @@ import ArrowIcon from "./icons/arrow-icon.vue";
       {{ dayNames[selectedDay + 1] }},
       {{ dayjs(selectedDate).format("DD.MM.YYYY") }}
     </span>
-    <ArrowIcon
-      style="transform: rotate(180deg)"
-      @click="selectedDate = dayjs(selectedDate).add(1, 'day').toDate()"
-    />
+    <ArrowIcon style="transform: rotate(180deg)" @click="nextDay" />
   </div>
 </template>