diff --git a/cypress/e2e/3_cache-crud-wizard.cy.js b/cypress/e2e/3_cache-crud-wizard.cy.js
index 2662dcc3..6f55c686 100644
--- a/cypress/e2e/3_cache-crud-wizard.cy.js
+++ b/cypress/e2e/3_cache-crud-wizard.cy.js
@@ -105,13 +105,13 @@ describe('Cache Creation Wizard', () => {
     downloadedFile.its('distributed-cache.mode').should('eq', 'SYNC');
 
     cy.get('[data-cy=downloadModal]').click();
-    cy.get('#XML').click();
+    cy.get('#modal-XML').click();
     cy.get('[data-cy=downloadButton]').click();
     downloadedFile = cy.readFile('./cypress/downloads/asuper-cache.xml');
     downloadedFile.should('exist');
 
     cy.get('[data-cy=downloadModal]').click();
-    cy.get('#YAML').click();
+    cy.get('#modal-YAML').click();
     cy.get('[data-cy=downloadButton]').click();
     downloadedFile = cy.readFile('./cypress/downloads/asuper-cache.yaml');
     downloadedFile.should('exist');
diff --git a/src/app/Caches/Create/DownloadCacheModal.tsx b/src/app/Caches/Create/DownloadCacheModal.tsx
index c10aa084..82aa0cd1 100644
--- a/src/app/Caches/Create/DownloadCacheModal.tsx
+++ b/src/app/Caches/Create/DownloadCacheModal.tsx
@@ -160,7 +160,7 @@ const DownloadCacheModal = (props: {
           <FormGroup hasNoPaddingTop isInline label="Code language" fieldId="code-language-radio-field">
             <Radio
               name="language-radio"
-              id="JSON"
+              id="modal-JSON"
               onChange={() => {
                 setDownloadLanguage(ConfigDownloadType.JSON);
               }}
@@ -169,14 +169,14 @@ const DownloadCacheModal = (props: {
             />
             <Radio
               name="language-radio"
-              id="XML"
+              id="modal-XML"
               onChange={() => setDownloadLanguage(ConfigDownloadType.XML)}
               isChecked={(downloadLanguage as ConfigDownloadType) == ConfigDownloadType.XML}
               label={t('caches.create.review.xml')}
             />
             <Radio
               name="language-radio"
-              id="YAML"
+              id="modal-YAML"
               onChange={() => setDownloadLanguage(ConfigDownloadType.YAML)}
               isChecked={(downloadLanguage as ConfigDownloadType) == ConfigDownloadType.YAML}
               label={t('caches.create.review.yaml')}