diff --git a/src/Avalonia.Base/Input/TextInput/TextInputReturnKeyType.cs b/src/Avalonia.Base/Input/TextInput/TextInputReturnKeyType.cs
index 9fd51766d3..bc7193eff5 100644
--- a/src/Avalonia.Base/Input/TextInput/TextInputReturnKeyType.cs
+++ b/src/Avalonia.Base/Input/TextInput/TextInputReturnKeyType.cs
@@ -3,15 +3,11 @@ namespace Avalonia.Input.TextInput;
 public enum TextInputReturnKeyType
 {
     Default,
+    Return,
+    Done,
     Go,
-    Google,
-    Join,
-    Next,
-    Route,
-    Search,
     Send,
-    Yahoo,
-    Done,
-    EmergencyCall,
-    Continue,
+    Search,
+    Next,
+    Previous
 }
diff --git a/src/iOS/Avalonia.iOS/TextInputResponder.Properties.cs b/src/iOS/Avalonia.iOS/TextInputResponder.Properties.cs
index cdc58d0c21..5298be107c 100644
--- a/src/iOS/Avalonia.iOS/TextInputResponder.Properties.cs
+++ b/src/iOS/Avalonia.iOS/TextInputResponder.Properties.cs
@@ -42,10 +42,16 @@ partial class AvaloniaView
             {
                 if (_view._options != null)
                 {
-                    if (_view._options.ReturnKeyType == TextInputReturnKeyType.Default)
+                    return _view._options.ReturnKeyType switch
                     {
-                        return _view._options.Multiline ? UIReturnKeyType.Default : UIReturnKeyType.Done;
-                    }
+                        TextInputReturnKeyType.Done => UIReturnKeyType.Done,
+                        TextInputReturnKeyType.Go => UIReturnKeyType.Go,
+                        TextInputReturnKeyType.Search => UIReturnKeyType.Search,
+                        TextInputReturnKeyType.Next => UIReturnKeyType.Next,
+                        TextInputReturnKeyType.Return => UIReturnKeyType.Default,
+                        TextInputReturnKeyType.Send => UIReturnKeyType.Send,
+                        _ => _view._options.Multiline ? UIReturnKeyType.Default : UIReturnKeyType.Done
+                    };
                 }
 
                 return UIReturnKeyType.Default;