diff --git a/packages/components/src/popover/style.scss b/packages/components/src/popover/style.scss
index 74a57d17197d2..8e581c516bd38 100644
--- a/packages/components/src/popover/style.scss
+++ b/packages/components/src/popover/style.scss
@@ -203,7 +203,7 @@ $arrow-size: 8px;
 	}
 
 	.components-popover:not([data-y-axis="middle"])[data-x-axis="right"] & {
-		margin-left: -24px;
+		margin-left: -($grid-unit-30 + $border-width);
 	}
 
 	.components-popover[data-x-axis="left"] & {
@@ -212,7 +212,7 @@ $arrow-size: 8px;
 	}
 
 	.components-popover:not([data-y-axis="middle"])[data-x-axis="left"] & {
-		margin-right: -24px;
+		margin-right: -($grid-unit-30 + $border-width);
 	}
 }