diff --git a/src/plugins/plan/components/PlanView.vue b/src/plugins/plan/components/PlanView.vue
index fab47328b1..d9c7d5d454 100644
--- a/src/plugins/plan/components/PlanView.vue
+++ b/src/plugins/plan/components/PlanView.vue
@@ -23,7 +23,7 @@
 <template>
   <div ref="plan" class="c-plan c-timeline-holder">
     <template v-if="viewBounds && !options.compact">
-      <SwimLane>
+      <SwimLane class="c-swimlane__time-axis">
         <template #label>{{ timeSystem.name }}</template>
         <template #object>
           <TimelineAxis
diff --git a/src/plugins/timeline/TimelineViewLayout.vue b/src/plugins/timeline/TimelineViewLayout.vue
index 3d67cf74ea..8edebe66f9 100644
--- a/src/plugins/timeline/TimelineViewLayout.vue
+++ b/src/plugins/timeline/TimelineViewLayout.vue
@@ -22,7 +22,11 @@
 
 <template>
   <div ref="timelineHolder" class="c-timeline-holder">
-    <SwimLane v-for="timeSystemItem in timeSystems" :key="timeSystemItem.timeSystem.key">
+    <SwimLane
+      v-for="timeSystemItem in timeSystems"
+      :key="timeSystemItem.timeSystem.key"
+      class="c-swimlane__time-axis"
+    >
       <template #label>
         {{ timeSystemItem.timeSystem.name }}
       </template>
diff --git a/src/plugins/timeline/timeline.scss b/src/plugins/timeline/timeline.scss
index 53ef590d12..03380e481c 100644
--- a/src/plugins/timeline/timeline.scss
+++ b/src/plugins/timeline/timeline.scss
@@ -27,6 +27,7 @@
     display: flex;
     flex-direction: column;
     gap: 1px;
+    height: 100%;
 
     // Plot view overrides
     .gl-plot-display-area,
diff --git a/src/ui/components/swim-lane/swimlane.scss b/src/ui/components/swim-lane/swimlane.scss
index a34a388fdf..e1696b5534 100644
--- a/src/ui/components/swim-lane/swimlane.scss
+++ b/src/ui/components/swim-lane/swimlane.scss
@@ -22,11 +22,21 @@
 
 .c-swimlane {
   display: grid;
+  flex: 1 1 auto;
   grid-template-columns: 100px 100px 1fr;
+  grid-template-rows: 1fr;
   grid-column-gap: 1px;
   grid-row-gap: 1px; // Used for grid within a swimlane for Plan views
+  min-height: $btnStdH;
+  overflow: auto;
   width: 100%;
 
+  &__time-axis {
+    flex: 0 0 auto;
+    height: 32px;
+    overflow: visible;
+  }
+
   &.is-status--draft {
     background: $colorTimeStripDraftBg;
   }