diff --git a/superset-frontend/src/common/components/common.stories.tsx b/superset-frontend/src/common/components/common.stories.tsx
index 3b31993a4e..c15ac5e1d3 100644
--- a/superset-frontend/src/common/components/common.stories.tsx
+++ b/superset-frontend/src/common/components/common.stories.tsx
@@ -20,6 +20,7 @@ import React, { useState, useRef, useCallback } from 'react';
 import { action } from '@storybook/addon-actions';
 import { withKnobs, boolean, select } from '@storybook/addon-knobs';
 import Button from 'src/components/Button';
+import { CronPicker, CronError } from 'src/components/CronPicker';
 import Modal from './Modal';
 import Tabs, { EditableTabs } from './Tabs';
 import { Tooltip as AntdTooltip } from './Tooltip';
@@ -27,7 +28,6 @@ import { Switch as AntdSwitch } from './Switch';
 import { Menu, Input, Divider } from '.';
 import { Dropdown } from './Dropdown';
 import InfoTooltip from './InfoTooltip';
-import { CronPicker, CronError } from './CronPicker';
 
 export default {
   title: 'Common components',
diff --git a/superset-frontend/src/common/components/CronPicker/CronPicker.test.tsx b/superset-frontend/src/components/CronPicker/CronPicker.test.tsx
similarity index 100%
rename from superset-frontend/src/common/components/CronPicker/CronPicker.test.tsx
rename to superset-frontend/src/components/CronPicker/CronPicker.test.tsx
diff --git a/superset-frontend/src/common/components/CronPicker/CronPicker.tsx b/superset-frontend/src/components/CronPicker/CronPicker.tsx
similarity index 100%
rename from superset-frontend/src/common/components/CronPicker/CronPicker.tsx
rename to superset-frontend/src/components/CronPicker/CronPicker.tsx
diff --git a/superset-frontend/src/common/components/CronPicker/index.ts b/superset-frontend/src/components/CronPicker/index.ts
similarity index 100%
rename from superset-frontend/src/common/components/CronPicker/index.ts
rename to superset-frontend/src/components/CronPicker/index.ts
diff --git a/superset-frontend/src/views/CRUD/alert/components/AlertReportCronScheduler.test.tsx b/superset-frontend/src/views/CRUD/alert/components/AlertReportCronScheduler.test.tsx
index ba65664475..a58f36a19d 100644
--- a/superset-frontend/src/views/CRUD/alert/components/AlertReportCronScheduler.test.tsx
+++ b/superset-frontend/src/views/CRUD/alert/components/AlertReportCronScheduler.test.tsx
@@ -20,7 +20,7 @@
 import React from 'react';
 import { ReactWrapper } from 'enzyme';
 import { styledMount as mount } from 'spec/helpers/theming';
-import { CronPicker } from 'src/common/components/CronPicker';
+import { CronPicker } from 'src/components/CronPicker';
 import { Input } from 'src/common/components';
 
 import { AlertReportCronScheduler } from './AlertReportCronScheduler';
diff --git a/superset-frontend/src/views/CRUD/alert/components/AlertReportCronScheduler.tsx b/superset-frontend/src/views/CRUD/alert/components/AlertReportCronScheduler.tsx
index 2e8b2d5995..a228bf02cf 100644
--- a/superset-frontend/src/views/CRUD/alert/components/AlertReportCronScheduler.tsx
+++ b/superset-frontend/src/views/CRUD/alert/components/AlertReportCronScheduler.tsx
@@ -21,8 +21,8 @@ import { t, useTheme } from '@superset-ui/core';
 
 import { Input, AntdInput } from 'src/common/components';
 import { Radio } from 'src/common/components/Radio';
-import { CronPicker, CronError } from 'src/common/components/CronPicker';
-import { StyledInputContainer } from '../AlertReportModal';
+import { CronPicker, CronError } from 'src/components/CronPicker';
+import { StyledInputContainer } from 'src/views/CRUD/alert/AlertReportModal';
 
 interface AlertReportCronSchedulerProps {
   value: string;