diff --git a/packages/calcite-components/src/components/popover/popover.scss b/packages/calcite-components/src/components/popover/popover.scss
index 56a721d6bc1..227cf5087c0 100644
--- a/packages/calcite-components/src/components/popover/popover.scss
+++ b/packages/calcite-components/src/components/popover/popover.scss
@@ -109,6 +109,10 @@
   border-end-end-radius: theme("borderRadius.DEFAULT");
 }
 
+.has-header .close-button-container {
+  border-end-end-radius: none;
+}
+
 ::slotted(calcite-panel),
 ::slotted(calcite-flow) {
   @apply h-full;