diff --git a/src/index.css b/src/index.css
index a11f30cfa9..6cd0084c92 100644
--- a/src/index.css
+++ b/src/index.css
@@ -96,4 +96,8 @@ code {
 
 .button-toolbar > button {
 	margin-left: .5rem;
+}
+
+.react-datepicker-wrapper {
+  flex-grow: 1;
 }
\ No newline at end of file
diff --git a/src/patients/GeneralInformation.tsx b/src/patients/GeneralInformation.tsx
index ca9a7f1f2c..e945ea996d 100644
--- a/src/patients/GeneralInformation.tsx
+++ b/src/patients/GeneralInformation.tsx
@@ -140,7 +140,7 @@ const GeneralInformation = (props: Props) => {
           </div>
         </div>
         <div className="row">
-          <div className="col-md-4">
+          <div className="col">
             {patient.isApproximateDateOfBirth ? (
               <TextInputWithLabelFormGroup
                 label={t('patient.approximateAge')}
@@ -169,7 +169,7 @@ const GeneralInformation = (props: Props) => {
               />
             )}
           </div>
-          <div className="col-md-2">
+          <div className="col">
             <div className="form-group">
               <Checkbox
                 label={t('patient.unknownDateOfBirth')}