diff --git a/src/Android/Accessibility/AccessibilityHelpers.cs b/src/Android/Accessibility/AccessibilityHelpers.cs
index 7a425d653..406e14e8c 100644
--- a/src/Android/Accessibility/AccessibilityHelpers.cs
+++ b/src/Android/Accessibility/AccessibilityHelpers.cs
@@ -125,6 +125,7 @@ namespace Bit.Droid.Accessibility
             new Browser("org.ungoogled.chromium.extensions.stable", "url_bar"),
             new Browser("org.ungoogled.chromium.stable", "url_bar"),
             new Browser("us.spotco.fennec_dos", "mozac_browser_toolbar_url_view,url_bar_title"), // 2nd = Legacy
+            new Browser("net.waterfox.android.release", "mozac_browser_toolbar_url_view"),
 
             // [Section B] Entries only present here
             //
diff --git a/src/Android/Autofill/AutofillHelpers.cs b/src/Android/Autofill/AutofillHelpers.cs
index 86d6cc828..6be3466b3 100644
--- a/src/Android/Autofill/AutofillHelpers.cs
+++ b/src/Android/Autofill/AutofillHelpers.cs
@@ -142,6 +142,7 @@ namespace Bit.Droid.Autofill
             "org.ungoogled.chromium.extensions.stable",
             "org.ungoogled.chromium.stable",
             "us.spotco.fennec_dos",
+            "net.waterfox.android.release",
         };
 
         // The URLs are blacklisted from autofilling
diff --git a/src/Android/Resources/xml/autofillservice.xml b/src/Android/Resources/xml/autofillservice.xml
index b29d3c7c6..7362f07b2 100644
--- a/src/Android/Resources/xml/autofillservice.xml
+++ b/src/Android/Resources/xml/autofillservice.xml
@@ -278,4 +278,7 @@
   <compatibility-package
     android:name="us.spotco.fennec_dos"
     android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="net.waterfox.android.release"
+    android:maxLongVersionCode="10000000000"/>
 </autofill-service>