diff --git a/src/scss/carousel.scss b/src/scss/carousel.scss
index 167146a8..75c19439 100644
--- a/src/scss/carousel.scss
+++ b/src/scss/carousel.scss
@@ -46,10 +46,10 @@
   cursor: grabbing;
 }
 
-:host([direction='vertical']) ::slotted(.embla__slide) {
+:host([direction='vertical']) ::slotted(.embla__slide:not(:last-of-type)) {
   margin-bottom: 5px;
 }
 
-:host([direction='horizontal']) ::slotted(.embla__slide) {
+:host([direction='horizontal']) ::slotted(.embla__slide:not(:last-of-type)) {
   margin-right: 5px;
 }
diff --git a/src/scss/live-carousel.scss b/src/scss/live-carousel.scss
index 3e080841..75d4ab43 100644
--- a/src/scss/live-carousel.scss
+++ b/src/scss/live-carousel.scss
@@ -6,6 +6,10 @@
 
   // Keep carousel controls relative to the media carousel itself.
   position: relative;
+
+  // See: https://github.com/dermotduffy/advanced-camera-card/issues/2107
+  border-radius: var(--ha-card-border-radius, 4px);
+  overflow: hidden;
 }
 
 // When the carousel is not part of a grid ensure its height matches its
diff --git a/src/scss/media-grid.scss b/src/scss/media-grid.scss
index 7a6535c1..6e1e270c 100644
--- a/src/scss/media-grid.scss
+++ b/src/scss/media-grid.scss
@@ -23,8 +23,6 @@
 
 ::slotted(*) {
   box-sizing: border-box;
-  border-radius: var(--ha-card-border-radius, 4px);
-  overflow: hidden;
   width: var(--advanced-camera-card-grid-column-size);
 
   // Unselected items included a transparent border to act as the effective
diff --git a/src/scss/viewer-carousel.scss b/src/scss/viewer-carousel.scss
index 845194f5..a241d392 100644
--- a/src/scss/viewer-carousel.scss
+++ b/src/scss/viewer-carousel.scss
@@ -6,6 +6,10 @@
 
   // Keep carousel controls relative to the media carousel itself.
   position: relative;
+
+  // See: https://github.com/dermotduffy/advanced-camera-card/issues/2107
+  border-radius: var(--ha-card-border-radius, 4px);
+  overflow: hidden;
 }
 
 // When the carousel is not part of a grid ensure its height matches its