diff --git a/plugins/woocommerce-admin/packages/components/src/calendar/style.scss b/plugins/woocommerce-admin/packages/components/src/calendar/style.scss
index 84d055bac1e..6ba0933c3a7 100644
--- a/plugins/woocommerce-admin/packages/components/src/calendar/style.scss
+++ b/plugins/woocommerce-admin/packages/components/src/calendar/style.scss
@@ -151,10 +151,6 @@
 		&::placeholder {
 			color: $core-grey-dark-300;
 		}
-
-		&:focus + span .woocommerce-calendar__input-error {
-			display: block;
-		}
 	}
 }
 
@@ -167,6 +163,15 @@
 .woocommerce-calendar__input-error {
 	display: none;
 
+	.is-error .woocommerce-calendar__input-text:focus + span & {
+		/* rtl:begin:ignore */
+		display: block;
+		left: 50% !important;
+		position: absolute;
+		top: auto !important;
+		/* rtl:end:ignore */
+	}
+
 	.components-popover__content {
 		background-color: $core-grey-dark-400;
 		color: $white;
diff --git a/plugins/woocommerce-admin/packages/components/src/filters/date/style.scss b/plugins/woocommerce-admin/packages/components/src/filters/date/style.scss
index 90e896c38c6..c1b1f311a19 100644
--- a/plugins/woocommerce-admin/packages/components/src/filters/date/style.scss
+++ b/plugins/woocommerce-admin/packages/components/src/filters/date/style.scss
@@ -111,8 +111,3 @@
 		margin: 0 $gap-small;
 	}
 }
-
-.woocommerce-filters-date__content.is-center:not(.is-mobile) > .components-popover__content {
-	transform: none;
-	margin-left: -160px;
-}