diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/screens/phone/PhoneAuthScreen.kt b/auth/src/main/java/com/firebase/ui/auth/ui/screens/phone/PhoneAuthScreen.kt
index e317c639d..3534148bf 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/screens/phone/PhoneAuthScreen.kt
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/screens/phone/PhoneAuthScreen.kt
@@ -16,6 +16,7 @@ package com.firebase.ui.auth.ui.screens.phone
 
 import android.content.Context
 import android.util.Log
+import androidx.activity.compose.BackHandler
 import androidx.activity.compose.LocalActivity
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -340,6 +341,8 @@ fun PhoneAuthScreen(
         }
     )
 
+    BackHandler { onCancel() }
+
     if (content != null) {
         content(state)
     } else {
@@ -372,6 +375,7 @@ private fun DefaultPhoneAuthContent(
         }
 
         PhoneAuthStep.EnterVerificationCode -> {
+            BackHandler { state.onChangeNumberClick() }
             EnterVerificationCodeUI(
                 configuration = configuration,
                 isLoading = state.isLoading,