diff --git a/app/assets/stylesheets/components/forms.scss b/app/assets/stylesheets/components/forms.scss
index ca3cefc7d..61e1dd4ff 100644
--- a/app/assets/stylesheets/components/forms.scss
+++ b/app/assets/stylesheets/components/forms.scss
@@ -382,6 +382,21 @@ textarea.crayons-textfield.crayons-textfield--ghost {
     }
   }
 
+  .CalendarMonthGrid__vertical {
+    margin-top: var(--su-2);
+
+    .c-date-picker__month {
+      margin-top: var(--su-2);
+    }
+
+    .CalendarMonth {
+      &_caption {
+        padding-bottom: var(--su-2);
+        padding-top: var(--su-3);
+      }
+    }
+  }
+
   // The triangular ? button which shows keyboard shortcut information
   .DayPickerKeyboardShortcuts_buttonReset {
     &::before {
diff --git a/app/javascript/crayons/formElements/DateRangePicker/DateRangePicker.jsx b/app/javascript/crayons/formElements/DateRangePicker/DateRangePicker.jsx
index 760a237d8..dd8880971 100644
--- a/app/javascript/crayons/formElements/DateRangePicker/DateRangePicker.jsx
+++ b/app/javascript/crayons/formElements/DateRangePicker/DateRangePicker.jsx
@@ -5,12 +5,18 @@ import 'react-dates/initialize';
 import moment from 'moment';
 import { DateRangePicker as ReactDateRangePicker } from 'react-dates';
 import defaultPhrases from 'react-dates/lib/defaultPhrases';
-import { START_DATE, ICON_BEFORE_POSITION } from 'react-dates/constants';
+import {
+  START_DATE,
+  ICON_BEFORE_POSITION,
+  VERTICAL_ORIENTATION,
+  HORIZONTAL_ORIENTATION,
+} from 'react-dates/constants';
 import { Icon } from '@crayons';
 import ChevronLeft from '@images/chevron-left.svg';
 import ChevronRight from '@images/chevron-right.svg';
 import Calendar from '@images/calendar.svg';
 import { getCurrentLocale } from '@utilities/runtime';
+import { useMediaQuery, BREAKPOINTS } from '@components/useMediaQuery';
 
 const PICKER_PHRASES = {
   ...defaultPhrases,
@@ -51,7 +57,7 @@ const MonthYearPicker = ({
   years.push(earliestMoment.year());
 
   return (
-    <div>
+    <div className="c-date-picker__month">
       <select
         aria-label="Navigate to month"
         className="crayons-select w-auto mr-2 fs-s"
@@ -110,6 +116,10 @@ export const DateRangePicker = ({
     defaultEndDate ? moment(defaultEndDate) : null,
   );
 
+  const useCompactLayout = useMediaQuery(
+    `(max-width: ${BREAKPOINTS.Medium - 1}px)`,
+  );
+
   const earliestMoment = moment(minStartDate);
   const latestMoment = moment(maxEndDate);
 
@@ -153,6 +163,9 @@ export const DateRangePicker = ({
         customInputIcon={<Icon src={Calendar} />}
         showDefaultInputIcon={!(startMoment || endMoment)}
         inputIconPosition={ICON_BEFORE_POSITION}
+        orientation={
+          useCompactLayout ? VERTICAL_ORIENTATION : HORIZONTAL_ORIENTATION
+        }
         showClearDates={startMoment || endMoment}
         customArrowIcon="-"
         phrases={PICKER_PHRASES}
@@ -172,6 +185,7 @@ export const DateRangePicker = ({
             endDate: endDate.toDate(),
           });
         }}
+        small={useCompactLayout}
         renderMonthElement={(props) => (
           <MonthYearPicker
             earliestMoment={earliestMoment}
diff --git a/app/javascript/crayons/formElements/DateRangePicker/__stories__/DateRangePicker.test.jsx b/app/javascript/crayons/formElements/DateRangePicker/__stories__/DateRangePicker.test.jsx
index 20b4b15f8..8a3918626 100644
--- a/app/javascript/crayons/formElements/DateRangePicker/__stories__/DateRangePicker.test.jsx
+++ b/app/javascript/crayons/formElements/DateRangePicker/__stories__/DateRangePicker.test.jsx
@@ -6,6 +6,17 @@ import '@testing-library/jest-dom';
 const windowNavigator = window.navigator;
 
 describe('<DateRangePicker />', () => {
+  beforeAll(() => {
+    global.window.matchMedia = jest.fn((query) => {
+      return {
+        matches: false,
+        media: query,
+        addListener: jest.fn(),
+        removeListener: jest.fn(),
+      };
+    });
+  });
+
   describe('Localization', () => {
     afterAll(() => {
       Object.defineProperty(window, 'navigator', {