diff --git a/app/component/route.scss b/app/component/route.scss
index 1f9964c35b..30f3f35752 100644
--- a/app/component/route.scss
+++ b/app/component/route.scss
@@ -112,7 +112,20 @@ $route-schedule-date-height: 36px;
   flex-direction: column;
   padding-bottom: 1.5em;
   overflow-x: hidden;
+  overflow-y: auto;
+  flex: 1 0;
+  flex-basis: 0px;
+  background-color: $white;
+  .route-stop:last-child .route-stop-row_content-container {
+    border-bottom: none;
+  }
+}
+
+.mobile .route-stop-list {
+  overflow-y: visible;
+  flex-basis: auto;
 }
+
 .bp-medium, .bp-large {
   &.location-details_container .route-now-content {
     & svg {
diff --git a/app/component/stop.scss b/app/component/stop.scss
index 778e56cf10..6b45bed24a 100644
--- a/app/component/stop.scss
+++ b/app/component/stop.scss
@@ -21,6 +21,18 @@
   }
 }
 
+.stop-scroll-container {
+  flex-basis: 0px;
+  flex-grow: 1;
+  .departure-list {
+    overflow-x: hidden;
+  }
+}
+.mobile .stop-scroll-container {
+  flex-basis: 100%;
+  overflow-y: visible;
+}
+
 .desktop .stop-page.header {
   .h3 {
     font-size: 24px;
diff --git a/app/component/summary.scss b/app/component/summary.scss
index 4c8911d2a0..85c1c7723b 100644
--- a/app/component/summary.scss
+++ b/app/component/summary.scss
@@ -1,5 +1,6 @@
 .desktop .summary {
-  flex: 1 1 0px;
+  flex: 1 0 0px;
+  flex-basis: 0px;
   display: flex;
   flex-direction: column;
   overflow-x: auto;