diff --git a/app/dashboard/templates/dashboard/mailbox_detail.html b/app/dashboard/templates/dashboard/mailbox_detail.html
index 1f068be1..85c4d75a 100644
--- a/app/dashboard/templates/dashboard/mailbox_detail.html
+++ b/app/dashboard/templates/dashboard/mailbox_detail.html
@@ -117,16 +117,16 @@
             </div>
           {% endif %}
 
-          <div class="form-group">
-            <label class="form-label">PGP Public Key</label>
-
-            <textarea name="pgp"
-                {% if not current_user.is_premium() %} disabled {% endif %}
-                      class="form-control" rows=10
-                      placeholder="-----BEGIN PGP PUBLIC KEY BLOCK-----">{{ mailbox.pgp_public_key or "" }}</textarea>
-          </div>
-
           <form method="post">
+            <div class="form-group">
+              <label class="form-label">PGP Public Key</label>
+
+              <textarea name="pgp"
+                  {% if not current_user.is_premium() %} disabled {% endif %}
+                        class="form-control" rows=10
+                        placeholder="-----BEGIN PGP PUBLIC KEY BLOCK-----">{{ mailbox.pgp_public_key or "" }}</textarea>
+            </div>
+
             <input type="hidden" name="form-name" value="pgp">
             <button class="btn btn-primary" name="action"
                 {% if not current_user.is_premium() %} disabled {% endif %}