diff --git a/lib/src/components/supa_email_auth.dart b/lib/src/components/supa_email_auth.dart
index ec0d23e..f18268e 100644
--- a/lib/src/components/supa_email_auth.dart
+++ b/lib/src/components/supa_email_auth.dart
@@ -142,6 +142,8 @@ class _SupaEmailAuthState extends State<SupaEmailAuth> {
             TextFormField(
               keyboardType: TextInputType.emailAddress,
               autofillHints: const [AutofillHints.email],
+              textInputAction:
+                  _forgotPassword ? TextInputAction.done : TextInputAction.next,
               validator: (value) {
                 if (value == null ||
                     value.isEmpty ||
@@ -162,6 +164,9 @@ class _SupaEmailAuthState extends State<SupaEmailAuth> {
                 autofillHints: _isSigningIn
                     ? [AutofillHints.password]
                     : [AutofillHints.newPassword],
+                textInputAction: widget.metadataFields != null && !_isSigningIn
+                    ? TextInputAction.next
+                    : TextInputAction.done,
                 validator: (value) {
                   if (value == null || value.isEmpty || value.length < 6) {
                     return localization.passwordLengthError;
@@ -181,6 +186,10 @@ class _SupaEmailAuthState extends State<SupaEmailAuth> {
                     .map((metadataField) => [
                           TextFormField(
                             controller: _metadataControllers[metadataField],
+                            textInputAction:
+                                widget.metadataFields!.last == metadataField
+                                    ? TextInputAction.done
+                                    : TextInputAction.next,
                             decoration: InputDecoration(
                               label: Text(metadataField.label),
                               prefixIcon: metadataField.prefixIcon,
diff --git a/lib/src/components/supa_phone_auth.dart b/lib/src/components/supa_phone_auth.dart
index 0f25100..9e733a6 100644
--- a/lib/src/components/supa_phone_auth.dart
+++ b/lib/src/components/supa_phone_auth.dart
@@ -57,6 +57,7 @@ class _SupaPhoneAuthState extends State<SupaPhoneAuth> {
           children: [
             TextFormField(
               autofillHints: const [AutofillHints.telephoneNumber],
+              textInputAction: TextInputAction.next,
               validator: (value) {
                 if (value == null || value.isEmpty) {
                   return localization.validPhoneNumberError;
@@ -74,6 +75,7 @@ class _SupaPhoneAuthState extends State<SupaPhoneAuth> {
               autofillHints: isSigningIn
                   ? [AutofillHints.password]
                   : [AutofillHints.newPassword],
+              textInputAction: TextInputAction.done,
               validator: (value) {
                 if (value == null || value.isEmpty || value.length < 6) {
                   return localization.passwordLengthError;