diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e080223d1..2c585de5bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -55,6 +55,8 @@
 
   ([PR #951](https://github.com/alphagov/govuk-frontend/pull/951))
 
+- Update date input component to use `display: inline-block`
+  ([PR #938](https://github.com/alphagov/govuk-frontend/pull/938))
 
 ## 1.2.0 (feature release)
 
diff --git a/src/components/date-input/_date-input.scss b/src/components/date-input/_date-input.scss
index 55a9cd6130..642c45688a 100644
--- a/src/components/date-input/_date-input.scss
+++ b/src/components/date-input/_date-input.scss
@@ -10,18 +10,18 @@
 @include govuk-exports("govuk/component/date-input") {
   .govuk-date-input {
     @include govuk-clearfix;
+    // font-size: 0 removes whitespace caused by inline-block
+    font-size: 0;
   }
 
   .govuk-date-input__item {
+    display: inline-block;
     margin-right: govuk-spacing(4);
     margin-bottom: 0;
-    float: left;
-    clear: none;
   }
 
   .govuk-date-input__label {
     display: block;
-    padding-bottom: 2px;
   }
 
   .govuk-date-input__input {