diff --git a/src/services/autofill.service.ts b/src/services/autofill.service.ts
index 13435a2660..2e734b53ff 100644
--- a/src/services/autofill.service.ts
+++ b/src/services/autofill.service.ts
@@ -639,7 +639,7 @@ export default class AutofillService implements AutofillServiceInterface {
                     fillFields.address2 = f;
                     break;
                 } else if (!fillFields.address3 && this.isFieldMatch(f[attr],
-                    ['address-3', 'address-line-3', 'addr-3', 'street-3'])) {
+                    IdentityAutoFillConstants.Address3FieldNames)) {
                     fillFields.address3 = f;
                     break;
                 } else if (!fillFields.postalCode && this.isFieldMatch(f[attr],
diff --git a/src/services/autofillConstants.ts b/src/services/autofillConstants.ts
index cd1b30e20f..d541fc287f 100644
--- a/src/services/autofillConstants.ts
+++ b/src/services/autofillConstants.ts
@@ -241,6 +241,13 @@ export class IdentityAutoFillConstants {
     "street-2",
   ];
 
+  static readonly Address3FieldNames: string[] = [
+    "address-3",
+    "address-line-3",
+    "addr-3",
+    "street-3",
+  ];
+
   static readonly IsoCountries: { [id: string]: string } = {
     afghanistan: "AF",
     "aland islands": "AX",