diff --git a/scss/_reboot.scss b/scss/_reboot.scss
index d815baea09ef..9f63ab68a8dc 100644
--- a/scss/_reboot.scss
+++ b/scss/_reboot.scss
@@ -528,9 +528,18 @@ legend {
 // Fix height of inputs with a type of datetime-local, date, month, week, or time
 // See https://github.com/twbs/bootstrap/issues/18842
 
-::-webkit-datetime-edit {
-  overflow: visible;
-  line-height: 0;
+::-webkit-datetime-edit-fields-wrapper,
+::-webkit-datetime-edit-text,
+::-webkit-datetime-edit-minute,
+::-webkit-datetime-edit-hour-field,
+::-webkit-datetime-edit-day-field,
+::-webkit-datetime-edit-month-field,
+::-webkit-datetime-edit-year-field {
+  padding: 0;
+}
+
+::-webkit-inner-spin-button {
+  height: auto;
 }
 
 // 1. Correct the outline style in Safari.