diff --git a/superset-frontend/src/common/components/common.stories.tsx b/superset-frontend/src/common/components/common.stories.tsx
index 1adb42dfbc..d9987f2af5 100644
--- a/superset-frontend/src/common/components/common.stories.tsx
+++ b/superset-frontend/src/common/components/common.stories.tsx
@@ -22,11 +22,11 @@ import { withKnobs, boolean, select } from '@storybook/addon-knobs';
 import Button from 'src/components/Button';
 import { CronPicker, CronError } from 'src/components/CronPicker';
 import Modal from 'src/components/Modal';
+import InfoTooltip from 'src/components/InfoTooltip';
 import Tabs, { EditableTabs } from './Tabs';
 import { Tooltip as AntdTooltip } from './Tooltip';
 import { Menu, Input, Divider } from '.';
 import { Dropdown } from './Dropdown';
-import InfoTooltip from './InfoTooltip';
 
 export default {
   title: 'Common components',
diff --git a/superset-frontend/src/common/components/InfoTooltip/index.tsx b/superset-frontend/src/components/InfoTooltip/index.tsx
similarity index 100%
rename from superset-frontend/src/common/components/InfoTooltip/index.tsx
rename to superset-frontend/src/components/InfoTooltip/index.tsx
diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx
index cb60cea145..105b77e539 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx
@@ -18,7 +18,7 @@
  */
 import React, { FunctionComponent, useState, useEffect } from 'react';
 import { styled, t } from '@superset-ui/core';
-import InfoTooltip from 'src/common/components/InfoTooltip';
+import InfoTooltip from 'src/components/InfoTooltip';
 import {
   useSingleViewResource,
   testDatabaseConnection,