diff --git a/packages/components/src/date-time/style.scss b/packages/components/src/date-time/style.scss
index 69f5eadb9acf9c..5eac3985921e4c 100644
--- a/packages/components/src/date-time/style.scss
+++ b/packages/components/src/date-time/style.scss
@@ -12,6 +12,7 @@
 
 	.components-datetime__calendar-help {
 		padding: $grid-unit-20;
+		min-width: 260px;
 
 		h4 {
 			margin: 0;
@@ -47,6 +48,10 @@
 		margin-top: 0;
 		margin-bottom: 0;
 	}
+
+	.components-button:focus {
+		z-index: z-index(".components-button {:focus or .is-primary}");
+	}
 }
 
 .components-datetime__date {