diff --git a/src/scss/thumbnail-carousel.scss b/src/scss/thumbnail-carousel.scss
index c0774cd5..410ceb93 100644
--- a/src/scss/thumbnail-carousel.scss
+++ b/src/scss/thumbnail-carousel.scss
@@ -28,6 +28,9 @@
 frigate-card-thumbnail {
   width: var(--frigate-card-thumbnail-size);
   height: var(--frigate-card-thumbnail-size);
+
+  // Do not let thumbnails span beyond the width of the carousel.
+  max-width: 100%;
 }
 frigate-card-thumbnail[details] {
   width: var(--frigate-card-thumbnail-details-width);
diff --git a/src/scss/timeline-core.scss b/src/scss/timeline-core.scss
index 9a9403c5..299cd2f4 100644
--- a/src/scss/timeline-core.scss
+++ b/src/scss/timeline-core.scss
@@ -141,6 +141,8 @@ div.vis-tooltip {
 
   // Use browser default font-family for tooltips.
   font-family: unset;
+
+  z-index: 30;
 }
 
 .target_bar {