diff --git a/extension/chrome/elements/add_pubkey.htm b/extension/chrome/elements/add_pubkey.htm
index fce335a0976..f5d6351dee6 100644
--- a/extension/chrome/elements/add_pubkey.htm
+++ b/extension/chrome/elements/add_pubkey.htm
@@ -35,7 +35,7 @@ <h1>Add a public key to email address</h1>
       or paste below:
     </div>
     <div class="line">
-      <textarea class="pubkey" placeholder="ASCII Armored Public Key" spellcheck="false" data-test="input-pubkey" maxlength="20000"></textarea>
+      <textarea class="pubkey" placeholder="ASCII Armored Public Key" spellcheck="false" data-test="input-pubkey" maxlength="30000"></textarea>
     </div>
     <div class="line orange" id="manual-import-warning" data-test="manual-import-warning">
       Manually importing Public Keys can be dangerous <br>
diff --git a/extension/chrome/settings/modules/contacts.htm b/extension/chrome/settings/modules/contacts.htm
index fd4ce0eaebf..e6bf8119c98 100644
--- a/extension/chrome/settings/modules/contacts.htm
+++ b/extension/chrome/settings/modules/contacts.htm
@@ -55,7 +55,7 @@ <h1></h1>
       <div class="line">
         <textarea class="input_pubkey"
           data-test="input-bulk-public-keys"
-          placeholder="Enter one or more ASCII Armored Public Keys&#10;(including -----BEGIN PGP PUBLIC KEY BLOCK-----)&#10;&#10;You can alternatively enter the Public Key fingerprint or longid,&#10;e.g. 7FDE685548AEA788 or 0x7fde685548aea788" maxlength="20000"></textarea>
+          placeholder="Enter one or more ASCII Armored Public Keys&#10;(including -----BEGIN PGP PUBLIC KEY BLOCK-----)&#10;&#10;You can alternatively enter the Public Key fingerprint or longid,&#10;e.g. 7FDE685548AEA788 or 0x7fde685548aea788" maxlength="30000"></textarea>
       </div>
       <div class="line">
         <button class="button green action_process long" data-test="action-show-parsed-public-keys">show contents</button>
@@ -72,7 +72,7 @@ <h1></h1>
 
     <div id="edit_contact" style="display: none;">
       <div class="line">
-        <textarea class="input_pubkey" data-test="input-public-key" placeholder="Enter a new Public Key for this contact" maxlength="20000"></textarea>
+        <textarea class="input_pubkey" data-test="input-public-key" placeholder="Enter a new Public Key for this contact" maxlength="30000"></textarea>
       </div>
       <div class="line">
         <button class="button green action_save_edited_pubkey long" data-test="action-save-public-key">SAVE</button>