diff --git a/superset-frontend/src/datasource/DatasourceModal.tsx b/superset-frontend/src/datasource/DatasourceModal.tsx
index 2dc1ceed025..839f1e3c5df 100644
--- a/superset-frontend/src/datasource/DatasourceModal.tsx
+++ b/superset-frontend/src/datasource/DatasourceModal.tsx
@@ -193,23 +193,23 @@ const DatasourceModal: FunctionComponent<DatasourceModalProps> = ({
               {t('Use legacy datasource editor')}
             </Button>
           )}
+          <Button
+            data-test="datasource-modal-cancel"
+            buttonSize="sm"
+            className="m-r-5"
+            onClick={onHide}
+          >
+            {t('Cancel')}
+          </Button>
           <Button
             buttonSize="sm"
             buttonStyle="primary"
-            className="m-r-5"
             data-test="datasource-modal-save"
             onClick={onClickSave}
             disabled={isSaving || errors.length > 0}
           >
             {t('Save')}
           </Button>
-          <Button
-            data-test="datasource-modal-cancel"
-            buttonSize="sm"
-            onClick={onHide}
-          >
-            {t('Cancel')}
-          </Button>
         </>
       }
       responsive