diff --git a/packages/flutter_mozilla_components/android/build.gradle b/packages/flutter_mozilla_components/android/build.gradle
index 6b57aa43..d190139f 100644
--- a/packages/flutter_mozilla_components/android/build.gradle
+++ b/packages/flutter_mozilla_components/android/build.gradle
@@ -126,6 +126,7 @@ dependencies {
     implementation "org.mozilla.components:feature-sitepermissions:$mozillaComponentsVersion"
     implementation "org.mozilla.components:feature-webcompat:$mozillaComponentsVersion"
     implementation "org.mozilla.components:feature-webnotifications:$mozillaComponentsVersion"
+    implementation "org.mozilla.components:feature-webauthn:$mozillaComponentsVersion"
     implementation "org.mozilla.components:ui-widgets:$mozillaComponentsVersion"
 
     implementation 'androidx.coordinatorlayout:coordinatorlayout:1.3.0'
diff --git a/packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/BaseBrowserFragment.kt b/packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/BaseBrowserFragment.kt
index ff10e628..51b2067f 100644
--- a/packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/BaseBrowserFragment.kt
+++ b/packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/BaseBrowserFragment.kt
@@ -41,6 +41,7 @@ import mozilla.components.feature.session.SwipeRefreshFeature
 import mozilla.components.feature.sitepermissions.SitePermissionsFeature
 import mozilla.components.feature.sitepermissions.SitePermissionsRules
 import mozilla.components.feature.sitepermissions.SitePermissionsRules.AutoplayAction
+import mozilla.components.feature.webauthn.WebAuthnFeature
 import mozilla.components.support.base.feature.ActivityResultHandler
 import mozilla.components.support.base.feature.UserInteractionHandler
 import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
@@ -69,6 +70,8 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit
     private val mediaSessionFullscreenFeature =
         ViewBoundFeatureWrapper<MediaSessionFullscreenFeature>()
 
+    private val webAuthnFeature = ViewBoundFeatureWrapper<WebAuthnFeature>()
+
     private var pictureInPictureFeature: PictureInPictureFeature? = null
 
     private val sessionId: String?
@@ -88,6 +91,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit
 
     private val activityResultHandler: List<ViewBoundFeatureWrapper<*>> = listOf(
         promptFeature,
+        webAuthnFeature
     )
 
     protected abstract fun createEngine(components: Components) : EngineView
@@ -299,6 +303,17 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit
             owner = this,
             view = binding.root,
         )
+
+        webAuthnFeature.set(
+            feature = WebAuthnFeature(
+                engine = components.core.engine,
+                activity = requireActivity(),
+                exitFullScreen = components.useCases.sessionUseCases.exitFullscreen::invoke,
+                currentTab = { components.core.store.state.selectedTabId },
+            ),
+            owner = this,
+            view = view
+        )
     }
 
     private fun restartApp(context: Context) {