--- a/browser/extensions/formautofill/content/manageDialog.js
+++ b/browser/extensions/formautofill/content/manageDialog.js
@@ -345,17 +345,17 @@ class ManageCreditCards extends ManageRe
    * Open the edit address dialog to create/edit a credit card.
    *
    * @param  {object} creditCard [optional]
    */
   async openEditDialog(creditCard) {
     // If master password is set, ask for password if user is trying to edit an
     // existing credit card.
     if (!creditCard || !this._hasMasterPassword || await MasterPassword.ensureLoggedIn(true)) {
-      this.prefWin.gSubDialog.open(EDIT_CREDIT_CARD_URL, null, creditCard);
+      this.prefWin.gSubDialog.open(EDIT_CREDIT_CARD_URL, "resizable=no", creditCard);
     }
   }
 
   /**
    * Get credit card display label. It should display masked numbers and the
    * cardholder's name, separated by a comma. If `showCreditCards` is set to
    * true, decrypted credit card numbers are shown instead.
    *

--- a/browser/extensions/formautofill/skin/shared/editAddress.css
+++ b/browser/extensions/formautofill/skin/shared/editAddress.css
@@ -4,16 +4,17 @@
 
 
 label > span {
   flex: 0 0 9.5em;
 }
 
 input,
 select {
+  flex: 1 0 auto;
   width: calc(50% - 9.5em);
   margin: 0;
 }
 
 #given-name-container,
 #additional-name-container,
 #address-level1-container,
 #postal-code-container,

--- a/browser/extensions/formautofill/skin/shared/editCreditCard.css
+++ b/browser/extensions/formautofill/skin/shared/editCreditCard.css
@@ -8,18 +8,21 @@ form {
 
 form > label,
 form > div {
   flex: 1 0 100%;
   align-self: center;
   margin: 0 0 0.5em !important;
 }
 
+input {
+  flex: 1 0 auto;
+}
+
 select {
-  flex: 0 0 5em;
   margin: 0;
   margin-inline-end: 0.7em;
 }
 
 label > span,
 div > span {
   flex: 0 0 9.5em;
 }

--- a/browser/extensions/formautofill/skin/shared/editDialog.css
+++ b/browser/extensions/formautofill/skin/shared/editDialog.css
@@ -44,16 +44,15 @@ textarea {
 button {
   padding-right: 10px;
   padding-left: 10px;
 }
 
 input,
 select {
   box-sizing: border-box;
-  flex: 1 0 auto;
 }
 
 #controls-container {
   flex: 0 1 100%;
   justify-content: end;
   margin: 1em 0 0;
 }