diff --git a/aleksis/apps/chronos/frontend/components/SelectTimetable.vue b/aleksis/apps/chronos/frontend/components/SelectTimetable.vue
index 1f90153388ecec80ec90485656a9f7909a391462..537b662923ec494cc99eda8294dafdc3cd3badd9 100644
--- a/aleksis/apps/chronos/frontend/components/SelectTimetable.vue
+++ b/aleksis/apps/chronos/frontend/components/SelectTimetable.vue
@@ -18,6 +18,11 @@ export default {
       required: false,
       default: false,
     },
+    limitHeight: {
+      default: false,
+      required: false,
+      type: Boolean,
+    },
   },
   data() {
     return {
@@ -88,6 +93,8 @@ export default {
       disable-pagination
       hide-default-footer
       :loading="loading"
+      :style="{ height: limitHeight ? '600px' : null }"
+      :class="{ 'overflow-auto': limitHeight }"
     >
       <template #default="{ items, isExpanded, expand }">
         <v-list class="scrollable-list">
diff --git a/aleksis/apps/chronos/frontend/components/TimetableWrapper.vue b/aleksis/apps/chronos/frontend/components/TimetableWrapper.vue
index 08a0bbbe133b11dbfda22f2261fda50adaff1b92..7212933bde1e28ae2269bbb1b37b5df6d6cb6f17 100644
--- a/aleksis/apps/chronos/frontend/components/TimetableWrapper.vue
+++ b/aleksis/apps/chronos/frontend/components/TimetableWrapper.vue
@@ -151,6 +151,7 @@ export default {
             v-model="selected"
             :loading="$apollo.queries.availableTimetables.loading"
             :available-timetables="availableTimetables"
+            limit-height
           />
         </v-card>
       </v-col>