diff --git a/src/services/autofill.service.ts b/src/services/autofill.service.ts
index 5ae0cf95c16..b9642ebdef0 100644
--- a/src/services/autofill.service.ts
+++ b/src/services/autofill.service.ts
@@ -620,7 +620,7 @@ export default class AutofillService implements AutofillServiceInterface {
                     fillFields.email = f;
                     break;
                 } else if (!fillFields.address && this.isFieldMatch(f[attr],
-                    IdentityAutoFillConstants.AddressFieldNames, ['mailing-addr', 'billing-addr', 'mail-addr', 'bill-addr'])) {
+                    IdentityAutoFillConstants.AddressFieldNames, IdentityAutoFillConstants.AddressFieldNameValues)) {
                     fillFields.address = f;
                     break;
                 } else if (!fillFields.address1 && this.isFieldMatch(f[attr],
diff --git a/src/services/autofillConstants.ts b/src/services/autofillConstants.ts
index b24c2c46f86..94b54a71505 100644
--- a/src/services/autofillConstants.ts
+++ b/src/services/autofillConstants.ts
@@ -325,6 +325,13 @@ export class IdentityAutoFillConstants {
     "bill-addr",
   ];
 
+  static readonly AddressFieldNameValues: string[] = [
+    "mailing-addr",
+    "billing-addr",
+    "mail-addr",
+    "bill-addr",
+  ];
+
   static readonly Address1FieldNames: string[] = [
     "address-1",
     "address-line-1",