diff --git a/public/app/features/manage-dashboards/DashboardImportPage.tsx b/public/app/features/manage-dashboards/DashboardImportPage.tsx
index 43297d1ec37..01d7b7aebb0 100644
--- a/public/app/features/manage-dashboards/DashboardImportPage.tsx
+++ b/public/app/features/manage-dashboards/DashboardImportPage.tsx
@@ -93,10 +93,20 @@ class UnthemedDashboardImport extends PureComponent<Props> {
     try {
       const json = JSON.parse(String(result));
 
-      if (json.elements) {
+      if (json.spec?.elements) {
+        dispatch(importDashboardV2Json(json.spec));
+        return;
+      } else if (json.elements) {
         dispatch(importDashboardV2Json(json));
         return;
       }
+
+      // check if it's a v1 resource format
+      if (json.spec) {
+        this.props.importDashboardJson(json.spec);
+        return;
+      }
+
       this.props.importDashboardJson(json);
     } catch (error) {
       if (error instanceof Error) {
@@ -113,11 +123,22 @@ class UnthemedDashboardImport extends PureComponent<Props> {
 
     const dashboard = JSON.parse(formData.dashboardJson);
 
-    if (dashboard.elements) {
+    // check if it's a v2 resource format
+    if (dashboard.spec?.elements) {
+      dispatch(importDashboardV2Json(dashboard.spec));
+      return;
+      // check if it's just a v2 spec
+    } else if (dashboard.elements) {
       dispatch(importDashboardV2Json(dashboard));
       return;
     }
 
+    // check if it's a v1 resource format
+    if (dashboard.spec) {
+      this.props.importDashboardJson(dashboard.spec);
+      return;
+    }
+
     this.props.importDashboardJson(dashboard);
   };
 
@@ -249,7 +270,7 @@ class UnthemedDashboardImport extends PureComponent<Props> {
     const { loadingState, dashboard } = this.props;
 
     if (loadingState === LoadingState.Done) {
-      if (dashboard.elements) {
+      if (dashboard.elements || dashboard.spec?.elements) {
         return <ImportDashboardOverviewV2 />;
       }
       return <ImportDashboardOverview />;