diff --git a/extension/chrome/settings/modules/my_key.htm b/extension/chrome/settings/modules/my_key.htm
index 2c5818a829d..1da60c7be2c 100644
--- a/extension/chrome/settings/modules/my_key.htm
+++ b/extension/chrome/settings/modules/my_key.htm
@@ -32,7 +32,9 @@
               
         <a href="#" class="action_download_pubkey">Save public key to a file</a>
       </div>
-      <div class="line show_when_showing_public pubkey_link_container" style="display: none">Share your public key: <a href="" target="_blank"></a></div>
+      <div class="line show_when_showing_public pubkey_link_container" style="display: none" data-test="container-shareable-pubkey-link">
+        Share your public key: <a href="" target="_blank"></a>
+      </div>
       <div class="line key_status_contatiner"></div>
       <div class="line">Key creation: <span class="key_creation" data-test="content-key-creation"></span></div>
       <div class="line">Key expiration: <span class="key_expiration" data-test="content-key-expiration"></span></div>
diff --git a/test/source/tests/flaky.ts b/test/source/tests/flaky.ts
index 68a36d957ef..49c04459aaf 100644
--- a/test/source/tests/flaky.ts
+++ b/test/source/tests/flaky.ts
@@ -109,6 +109,10 @@ export const defineFlakyTests = (testVariant: TestVariant, testWithBrowser: Test
           { submitPubkey: true, usedPgpBefore: true },
           { isSavePassphraseChecked: false, isSavePassphraseHidden: false }
         );
+        await SettingsPageRecipe.toggleScreen(settingsPage, 'additional');
+        await settingsPage.waitAndClick('@action-open-pubkey-page');
+        const myKeyFrame = await settingsPage.getFrame(['my_key.htm']);
+        expect(await myKeyFrame.isElementPresent('@container-shareable-pubkey-link')).to.be.true;
       })
     );
 
@@ -245,6 +249,7 @@ export const defineFlakyTests = (testVariant: TestVariant, testWithBrowser: Test
         await SetupPageRecipe.createKey(settingsPage, 'unused', 'none', {
           selectKeyAlgo: 'rsa3072',
           key: { passphrase: 'long enough to suit requirements' },
+          submitPubkey: false,
         });
         await SettingsPageRecipe.toggleScreen(settingsPage, 'additional');
 
@@ -253,11 +258,11 @@ export const defineFlakyTests = (testVariant: TestVariant, testWithBrowser: Test
           t,
           `chrome/settings/modules/my_key.htm?placement=settings&parentTabId=60%3A0&acctEmail=${acctEmail}&fingerprint=${fingerprint}`
         );
+        expect(await myKeyFrame.isElementPresent('@container-shareable-pubkey-link')).to.be.false;
         const downloadedFiles = await myKeyFrame.awaitDownloadTriggeredByClicking('@action-download-prv');
         // const longid = OpenPGPKey.fingerprintToLongid(fingerprint);
         const longid = fingerprint.substring(fingerprint.length - 16);
         const fileName = `flowcrypt-backup-usernosubmitclientconfigurationflowcrypttest-0x${longid}.asc`;
-
         const key = await KeyUtil.parse(downloadedFiles[fileName].toString());
         expect(key.algo.bits).to.equal(3072);
         expect(key.algo.algorithm).to.equal('rsaEncryptSign');