diff --git a/frontend/src/js/common/helpers/mergeRefs.ts b/frontend/src/js/common/helpers/mergeRefs.ts
new file mode 100644
index 00000000000..20b0e38f174
--- /dev/null
+++ b/frontend/src/js/common/helpers/mergeRefs.ts
@@ -0,0 +1,17 @@
+type Mutable<T> = {
+  -readonly [k in keyof T]: T[k];
+};
+
+export const mergeRefs =
+  <T>(...refs: React.Ref<T>[]) =>
+  (value: T): void => {
+    for (let i = 0; i < refs.length; i += 1) {
+      const ref = refs[i];
+
+      if (typeof ref === "function") {
+        ref(value);
+      } else if (ref) {
+        (ref as Mutable<React.RefObject<T>>).current = value;
+      }
+    }
+  };
diff --git a/frontend/src/js/ui-components/InputDate/CustomHeader.tsx b/frontend/src/js/ui-components/InputDate/CustomHeader.tsx
index 83b0b594c05..310df8480b7 100644
--- a/frontend/src/js/ui-components/InputDate/CustomHeader.tsx
+++ b/frontend/src/js/ui-components/InputDate/CustomHeader.tsx
@@ -102,7 +102,7 @@ const YearMonthSelect = ({
     value: i,
   }));
 
-  const [yearSelectOpen, setYearSelectOpen] = useState(false);
+  const [yearSelectOpen, setYearSelectOpen] = useState(true);
   const [monthSelectOpen, setMonthSelectOpen] = useState(false);
   const handleClick = () => {
     if (yearSelectOpen || monthSelectOpen) {
diff --git a/frontend/src/js/ui-components/InputDate/InputDate.tsx b/frontend/src/js/ui-components/InputDate/InputDate.tsx
index 00e57bc56b1..7b4d9878568 100644
--- a/frontend/src/js/ui-components/InputDate/InputDate.tsx
+++ b/frontend/src/js/ui-components/InputDate/InputDate.tsx
@@ -1,9 +1,12 @@
 import styled from "@emotion/styled";
-import { createElement, forwardRef, useRef, useState } from "react";
+import { faCalendar } from "@fortawesome/free-regular-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { createElement, forwardRef, useRef } from "react";
 import ReactDatePicker from "react-datepicker";
 import "react-datepicker/dist/react-datepicker.css";
 
 import { formatDate, parseDate } from "../../common/helpers/dateHelper";
+import { mergeRefs } from "../../common/helpers/mergeRefs";
 import BaseInput, { Props as BaseInputProps } from "../BaseInput";
 
 import { CustomHeader } from "./CustomHeader";
@@ -19,11 +22,25 @@ const Root = styled("div")`
   }
   .react-datepicker-popper[data-placement^="bottom"] {
     padding-top: 4px;
-    transform: translate3d(0, 32px, 0) !important;
   }
   .react-datepicker-popper[data-placement^="top"] {
     padding-bottom: 0;
-    transform: translate3d(0, 32px, 0) !important;
+  }
+`;
+
+const CalendarIcon = styled(FontAwesomeIcon)`
+  position: absolute;
+  width: 16px;
+  height: 16px;
+  top: calc(50% - 8px);
+  left: 5px;
+  cursor: pointer;
+  color: ${({ theme }) => theme.col.black};
+`;
+
+const StyledBaseInput = styled(BaseInput)`
+  input {
+    padding-left: 22px;
   }
 `;
 
@@ -45,28 +62,12 @@ type Props = Omit<BaseInputProps, "inputType"> & {
   onCalendarSelect?: (val: string) => void;
 };
 
-// TODO: Remove this once we have solved
-// - that the date picker overlays other fields in forms
-const TEMPORARILY_DISABLED_DATE_PICKER = true;
-
-const InputDate = forwardRef<HTMLInputElement, Props>(
+const InputDate = forwardRef<ReactDatePicker, Props>(
   (
-    {
-      className,
-      value,
-      dateFormat,
-      onChange,
-      onCalendarSelect,
-      onFocus,
-      onBlur,
-      onClick,
-      ...props
-    },
+    { className, value, dateFormat, onChange, onCalendarSelect, ...props },
     ref,
   ) => {
     const datePickerRef = useRef<ReactDatePicker>(null);
-    const [hasFocus, setHasFocus] = useState(false);
-    const [focusBlocked, setFocusBlocked] = useState(false);
 
     return (
       <Root
@@ -75,34 +76,13 @@ const InputDate = forwardRef<HTMLInputElement, Props>(
           if (e.key === "Escape") datePickerRef.current?.setOpen(false);
         }}
       >
-        <BaseInput
+        <StyledBaseInput
           {...props}
-          ref={ref}
           inputType="text"
           value={value}
           onChange={(val) => {
             onChange(val as string);
           }}
-          onFocus={(e) => {
-            if (focusBlocked) {
-              e.currentTarget.blur();
-              setFocusBlocked(false);
-            } else {
-              onFocus?.(e);
-              setHasFocus(true);
-              datePickerRef.current?.setOpen(true);
-            }
-          }}
-          onBlur={(e) => {
-            onBlur?.(e);
-            setHasFocus(false);
-          }}
-          onClick={(e) => {
-            onClick?.(e);
-            if (hasFocus) {
-              datePickerRef.current?.setOpen(true);
-            }
-          }}
           inputProps={{
             ...props?.inputProps,
             onKeyPress: (e) => {
@@ -111,8 +91,12 @@ const InputDate = forwardRef<HTMLInputElement, Props>(
             },
           }}
         />
+        <CalendarIcon
+          icon={faCalendar}
+          onClick={() => datePickerRef.current?.setOpen(true)}
+        />
         <ReactDatePicker
-          ref={datePickerRef}
+          ref={mergeRefs(datePickerRef, ref)}
           selected={value ? parseDate(value, dateFormat) : new Date()}
           onChange={(val) => {
             if (!val) {
@@ -122,7 +106,6 @@ const InputDate = forwardRef<HTMLInputElement, Props>(
             const selectedDate = formatDate(val, dateFormat);
             onChange(selectedDate);
             onCalendarSelect?.(selectedDate);
-            setFocusBlocked(true);
             datePickerRef.current?.setOpen(false);
           }}
           onClickOutside={() => datePickerRef.current?.setOpen(false)}
@@ -130,7 +113,16 @@ const InputDate = forwardRef<HTMLInputElement, Props>(
           customInput={createElement(HiddenInput)}
           calendarContainer={StyledCalendar}
           calendarStartDay={1}
-          disabled={TEMPORARILY_DISABLED_DATE_PICKER}
+          popperProps={{
+            modifiers: [
+              {
+                name: "preventOverflow",
+                options: {
+                  mainAxis: false,
+                },
+              },
+            ],
+          }}
         />
       </Root>
     );
diff --git a/frontend/src/js/ui-components/InputDateRange.tsx b/frontend/src/js/ui-components/InputDateRange.tsx
index e58a00745e9..33d2bdb747c 100644
--- a/frontend/src/js/ui-components/InputDateRange.tsx
+++ b/frontend/src/js/ui-components/InputDateRange.tsx
@@ -2,6 +2,7 @@ import { css } from "@emotion/react";
 import styled from "@emotion/styled";
 import { faCalendar } from "@fortawesome/free-regular-svg-icons";
 import { FC, ReactNode, createRef, useMemo } from "react";
+import ReactDatePicker from "react-datepicker";
 import { useTranslation } from "react-i18next";
 
 import { IndexPrefix } from "../common/components/IndexPrefix";
@@ -166,7 +167,7 @@ const InputDateRange: FC<PropsT> = ({
   const min = getDisplayDate("min", value, displayDateFormat);
   const max = getDisplayDate("max", value, displayDateFormat);
 
-  const maxRef = createRef<HTMLInputElement>();
+  const maxRef = createRef<ReactDatePicker>();
 
   const isMinValid = exists(value.min && parseDate(min, displayDateFormat));
   const isMaxValid = exists(value.max && parseDate(max, displayDateFormat));
@@ -213,7 +214,7 @@ const InputDateRange: FC<PropsT> = ({
             onChange={(val) =>
               onChangeRaw("min", val as string, displayDateFormat)
             }
-            onCalendarSelect={() => maxRef.current?.focus()}
+            onCalendarSelect={() => maxRef.current?.setOpen(true)}
             onBlur={(e) => applyDate("min", e.target.value, displayDateFormat)}
             inputProps={{
               autoFocus,