diff --git a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.tsx b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.tsx
index 129e9a3a2c1..0f9b89da1c2 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.tsx
@@ -127,8 +127,8 @@ export function TimeRangePicker(props: TimeRangePickerProps) {
       {isOpen && (
         <>
           <div role="presentation" className={cx(modalBackdrop, styles.backdrop)} {...underlayProps} />
-          <section className={styles.content} ref={ref} {...overlayProps} {...dialogProps}>
-            <FocusScope contain autoFocus>
+          <FocusScope contain autoFocus>
+            <section className={styles.content} ref={ref} {...overlayProps} {...dialogProps}>
               <TimePickerContent
                 timeZone={timeZone}
                 fiscalYearStartMonth={fiscalYearStartMonth}
@@ -142,8 +142,8 @@ export function TimeRangePicker(props: TimeRangePickerProps) {
                 onChangeFiscalYearStartMonth={onChangeFiscalYearStartMonth}
                 hideQuickRanges={hideQuickRanges}
               />
-            </FocusScope>
-          </section>
+            </section>
+          </FocusScope>
         </>
       )}