diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx
index 5b9c57a463876..c85db9dc0cc66 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx
@@ -64,9 +64,15 @@ interface FieldPropTypes {
   isEditMode?: boolean;
   sslForced?: boolean;
   defaultDBName?: string;
+  editNewDb?: boolean;
 }
 
-const CredentialsInfo = ({ changeMethods, isEditMode, db }: FieldPropTypes) => {
+const CredentialsInfo = ({
+  changeMethods,
+  isEditMode,
+  db,
+  editNewDb,
+}: FieldPropTypes) => {
   const [uploadOption, setUploadOption] = useState<number>(
     CredentialInfoOptions.jsonUpload.valueOf(),
   );
@@ -95,7 +101,9 @@ const CredentialsInfo = ({ changeMethods, isEditMode, db }: FieldPropTypes) => {
           </Select>
         </>
       )}
-      {uploadOption === CredentialInfoOptions.copyPaste || isEditMode ? (
+      {uploadOption === CredentialInfoOptions.copyPaste ||
+      isEditMode ||
+      editNewDb ? (
         <div className="input-container">
           <span className="label-select">Service Account</span>
           <textarea
@@ -378,9 +386,11 @@ const DatabaseConnectionForm = ({
   db,
   isEditMode = false,
   sslForced,
+  editNewDb,
 }: {
   isEditMode?: boolean;
   sslForced: boolean;
+  editNewDb?: boolean;
   dbModel: DatabaseForm;
   db: Partial<DatabaseObject> | null;
   onParametersChange: (
@@ -422,6 +432,7 @@ const DatabaseConnectionForm = ({
             key: field,
             isEditMode,
             sslForced,
+            editNewDb,
           }),
         )}
     </div>
diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
index 9eae554c5c0bf..e1b23358ca87b 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
@@ -330,7 +330,8 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
     availableDbs?.databases?.find(
       (available: { engine: string | undefined }) =>
         // TODO: we need a centralized engine in one place
-        available.engine === (isEditMode ? db?.backend : db?.engine),
+        available.engine ===
+        (isEditMode || editNewDb ? db?.backend || db?.engine : db?.engine),
     ) || {};
 
   // Test Connection logic
@@ -718,6 +719,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
         }
         getValidation={() => getValidation(db)}
         validationErrors={validationErrors}
+        editNewDb={editNewDb}
       />
     );
   };