diff --git a/.changeset/cold-pillows-mix.md b/.changeset/cold-pillows-mix.md
new file mode 100644
index 0000000000..12dc9422aa
--- /dev/null
+++ b/.changeset/cold-pillows-mix.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-import': patch
+---
+
+Swap `ImportStepper` and `InfoCard` order to fix tab order in `catalog-import`.
diff --git a/plugins/catalog-import/src/components/DefaultImportPage/DefaultImportPage.tsx b/plugins/catalog-import/src/components/DefaultImportPage/DefaultImportPage.tsx
index 30cce9603a..c777953808 100644
--- a/plugins/catalog-import/src/components/DefaultImportPage/DefaultImportPage.tsx
+++ b/plugins/catalog-import/src/components/DefaultImportPage/DefaultImportPage.tsx
@@ -22,7 +22,7 @@ import {
SupportButton,
} from '@backstage/core-components';
import { configApiRef, useApi } from '@backstage/core-plugin-api';
-import { Grid } from '@material-ui/core';
+import { Grid, useMediaQuery, useTheme } from '@material-ui/core';
import React from 'react';
import { ImportInfoCard } from '../ImportInfoCard';
import { ImportStepper } from '../ImportStepper';
@@ -33,9 +33,21 @@ import { ImportStepper } from '../ImportStepper';
* @public
*/
export const DefaultImportPage = () => {
+ const theme = useTheme();
const configApi = useApi(configApiRef);
+ const isMobile = useMediaQuery(theme.breakpoints.down('sm'));
const appTitle = configApi.getOptional('app.title') || 'Backstage';
+ const contentItems = [
+
+
+ ,
+
+
+
+ ,
+ ];
+
return (
@@ -47,14 +59,8 @@ export const DefaultImportPage = () => {
-
-
-
-
-
-
-
-
+
+ {isMobile ? contentItems : contentItems.reverse()}