diff --git a/aleksis/apps/chronos/frontend/components/NoTimetableCard.vue b/aleksis/apps/chronos/frontend/components/NoTimetableCard.vue
index f11b2ed2ebc60b72895f3e682c4b66cc024fddad..e750d01e98cb1969233e176f42492f4d7900939a 100644
--- a/aleksis/apps/chronos/frontend/components/NoTimetableCard.vue
+++ b/aleksis/apps/chronos/frontend/components/NoTimetableCard.vue
@@ -25,7 +25,13 @@ export default {
     v-bind="$attrs"
   >
     <div class="text-center">
-      <mascot type="timetable" size="60" class="mb-4" />
+      <mascot
+        type="timetable"
+        class="mb-4"
+        max-width="min(80vw, 600px)"
+        max-height="min(50vh, 500px)"
+        contain
+      />
       <div class="text-h5 grey--text text--darken-2 mb-2">
         {{ $t(titleKey) }}
       </div>
diff --git a/aleksis/apps/chronos/frontend/components/Timetable.vue b/aleksis/apps/chronos/frontend/components/Timetable.vue
index 794883d3d420a3ca4bd837d31575da07918c1fe5..8e4edd36f62c851841cc54e6cbe8897800febe2d 100644
--- a/aleksis/apps/chronos/frontend/components/Timetable.vue
+++ b/aleksis/apps/chronos/frontend/components/Timetable.vue
@@ -101,6 +101,7 @@ export default {
         :params="{ type: selected.type, id: selected.objId }"
         ref="calendarWithControls"
         :calendar-days-of-week="timetableDays"
+        scroll-target="first"
         @changeCalendarFocus="setCalendarFocus"
         @changeCalendarType="setCalendarType"
         @calendarReady="setInnerFocusAndType"