diff --git a/src/Controls/src/Core/Editor/Editor.Android.cs b/src/Controls/src/Core/Editor/Editor.Android.cs
index 851df83ca820..b96d0eff8814 100644
--- a/src/Controls/src/Core/Editor/Editor.Android.cs
+++ b/src/Controls/src/Core/Editor/Editor.Android.cs
@@ -18,5 +18,22 @@ public static void MapText(IEditorHandler handler, Editor editor)
 
 			Platform.EditTextExtensions.UpdateText(handler.PlatformView, editor);
 		}
+
+		// TODO: Material3 - make it public in .net 11
+		internal static void MapText(EditorHandler2 handler, Editor editor)
+		{
+			if (handler.PlatformView is null)
+			{
+				return;
+			}
+
+			if (handler.DataFlowDirection == DataFlowDirection.FromPlatform)
+			{
+				Platform.EditTextExtensions.UpdateTextFromPlatform(handler.PlatformView, editor);
+				return;
+			}
+
+			Platform.EditTextExtensions.UpdateText(handler.PlatformView, editor);
+		}
 	}
 }
diff --git a/src/Controls/src/Core/Editor/Editor.Mapper.cs b/src/Controls/src/Core/Editor/Editor.Mapper.cs
index d2dc2b69a706..0258acedebea 100644
--- a/src/Controls/src/Core/Editor/Editor.Mapper.cs
+++ b/src/Controls/src/Core/Editor/Editor.Mapper.cs
@@ -15,6 +15,16 @@ public partial class Editor
 			EditorHandler.Mapper.ReplaceMapping<Editor, IEditorHandler>(nameof(Text), MapText);
 			EditorHandler.Mapper.ReplaceMapping<Editor, IEditorHandler>(nameof(TextTransform), MapText);
 
+#if ANDROID
+			if (RuntimeFeature.IsMaterial3Enabled)
+			{
+				EditorHandler2.Mapper.ReplaceMapping<Editor, EditorHandler2>(nameof(Text), MapText);
+				EditorHandler2.Mapper.ReplaceMapping<Editor, EditorHandler2>(nameof(TextTransform), MapText);
+				EditorHandler2.Mapper.AppendToMapping<Editor, EditorHandler2>(nameof(VisualElement.IsFocused), InputView.MapIsFocused);
+				EditorHandler2.CommandMapper.PrependToMapping<Editor, EditorHandler2>(nameof(IEditor.Focus), InputView.MapFocus);
+			}
+#endif
+
 #if IOS || ANDROID
 			EditorHandler.Mapper.AppendToMapping(nameof(VisualElement.IsFocused), InputView.MapIsFocused);
 			EditorHandler.Mapper.AppendToMapping(nameof(VisualElement.IsVisible), InputView.MapIsVisible);
diff --git a/src/Controls/src/Core/Hosting/AppHostBuilderExtensions.cs b/src/Controls/src/Core/Hosting/AppHostBuilderExtensions.cs
index 22c823e71038..28a3bc2b3abb 100644
--- a/src/Controls/src/Core/Hosting/AppHostBuilderExtensions.cs
+++ b/src/Controls/src/Core/Hosting/AppHostBuilderExtensions.cs
@@ -70,6 +70,18 @@ internal static IMauiHandlersCollection AddControlsHandlers(this IMauiHandlersCo
 		handlersCollection.AddHandler<CollectionView, CollectionViewHandler>();
 		handlersCollection.AddHandler<CarouselView, CarouselViewHandler>();
 #endif
+#if ANDROID
+		if (RuntimeFeature.IsMaterial3Enabled)
+		{
+			handlersCollection.AddHandler<Editor, EditorHandler2>();
+		}
+		else
+		{
+			handlersCollection.AddHandler<Editor, EditorHandler>();
+		}
+#else
+		handlersCollection.AddHandler<Editor, EditorHandler>();
+#endif
 #if ANDROID
 		if (RuntimeFeature.IsMaterial3Enabled)
 		{
@@ -111,7 +123,6 @@ internal static IMauiHandlersCollection AddControlsHandlers(this IMauiHandlersCo
 		handlersCollection.AddHandler<BoxView, BoxViewHandler>();
 		handlersCollection.AddHandler<Button, ButtonHandler>();
 		handlersCollection.AddHandler<DatePicker, DatePickerHandler>();
-		handlersCollection.AddHandler<Editor, EditorHandler>();
 		handlersCollection.AddHandler<Entry, EntryHandler>();
 		handlersCollection.AddHandler<GraphicsView, GraphicsViewHandler>();
 		handlersCollection.AddHandler<Image, ImageHandler>();
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorCharacterSpacingWhenFontFamily.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorCharacterSpacingWhenFontFamily.png
new file mode 100644
index 000000000000..10c2e9ddb1c6
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorCharacterSpacingWhenFontFamily.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorCharacterSpacingWhenMaxLengthSet.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorCharacterSpacingWhenMaxLengthSet.png
new file mode 100644
index 000000000000..ed7778662acd
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorCharacterSpacingWhenMaxLengthSet.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorControlWhenFlowDirectionSet.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorControlWhenFlowDirectionSet.png
new file mode 100644
index 000000000000..9d1c6cb28411
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorControlWhenFlowDirectionSet.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorControlWhenPlaceholderColorSet.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorControlWhenPlaceholderColorSet.png
new file mode 100644
index 000000000000..d7e1c596af3c
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorControlWhenPlaceholderColorSet.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorControlWhenPlaceholderTextSet.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorControlWhenPlaceholderTextSet.png
new file mode 100644
index 000000000000..479b683085a7
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorControlWhenPlaceholderTextSet.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorHorizontalTextAlignmentBasedOnCharacterSpacing.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorHorizontalTextAlignmentBasedOnCharacterSpacing.png
new file mode 100644
index 000000000000..00c6b4f88b56
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorHorizontalTextAlignmentBasedOnCharacterSpacing.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png
new file mode 100644
index 000000000000..90e617754ade
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorPlaceholderWhenFlowDirectionSet.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorPlaceholderWhenFlowDirectionSet.png
new file mode 100644
index 000000000000..2070f5d96535
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorPlaceholderWhenFlowDirectionSet.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorPlaceholderWithCharacterSpacing.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorPlaceholderWithCharacterSpacing.png
new file mode 100644
index 000000000000..9cdae0a1382e
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorPlaceholderWithCharacterSpacing.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorPlaceholderWithFontAttributes.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorPlaceholderWithFontAttributes.png
new file mode 100644
index 000000000000..87d44a246707
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorPlaceholderWithFontAttributes.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorPlaceholderWithFontFamily.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorPlaceholderWithFontFamily.png
new file mode 100644
index 000000000000..b670f774b6f6
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorPlaceholderWithFontFamily.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorPlaceholderWithFontSize.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorPlaceholderWithFontSize.png
new file mode 100644
index 000000000000..34bf729a7dfe
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorPlaceholderWithFontSize.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorPlaceholderWithHorizontalAlignment.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorPlaceholderWithHorizontalAlignment.png
new file mode 100644
index 000000000000..c00fbfd1436a
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorPlaceholderWithHorizontalAlignment.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorPlaceholderWithShadow.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorPlaceholderWithShadow.png
new file mode 100644
index 000000000000..992300cdb23e
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorPlaceholderWithShadow.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorPlaceholderWithVerticalAlignment.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorPlaceholderWithVerticalAlignment.png
new file mode 100644
index 000000000000..4a398118852f
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorPlaceholderWithVerticalAlignment.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorTextWhenAlingnedHorizontally.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorTextWhenAlingnedHorizontally.png
new file mode 100644
index 000000000000..61bc9622bab6
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorTextWhenAlingnedHorizontally.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorTextWhenAlingnedVertically.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorTextWhenAlingnedVertically.png
new file mode 100644
index 000000000000..9667e458eeed
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorTextWhenAlingnedVertically.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorTextWhenCharacterSpacingSetValues.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorTextWhenCharacterSpacingSetValues.png
new file mode 100644
index 000000000000..b62f05a0a781
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorTextWhenCharacterSpacingSetValues.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorTextWhenFontAttributesSet.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorTextWhenFontAttributesSet.png
new file mode 100644
index 000000000000..23154e7fcbfc
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorTextWhenFontAttributesSet.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorTextWhenFontFamilySetValue.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorTextWhenFontFamilySetValue.png
new file mode 100644
index 000000000000..ed1f07a4eecb
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorTextWhenFontFamilySetValue.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorTextWhenFontSizeSetCorrectly.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorTextWhenFontSizeSetCorrectly.png
new file mode 100644
index 000000000000..bfc8b2b7fbbf
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorTextWhenFontSizeSetCorrectly.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorTextWhenTextColorSetCorrectly.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorTextWhenTextColorSetCorrectly.png
new file mode 100644
index 000000000000..a89f07711646
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorTextWhenTextColorSetCorrectly.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorVerticalTextAlignmentBasedOnCharacterSpacing.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorVerticalTextAlignmentBasedOnCharacterSpacing.png
new file mode 100644
index 000000000000..a31a068511c1
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditorVerticalTextAlignmentBasedOnCharacterSpacing.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditor_WithShadow.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditor_WithShadow.png
new file mode 100644
index 000000000000..7073a66a9268
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyEditor_WithShadow.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyzEditorPlaceholderWithAutoSizeDiabled.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyzEditorPlaceholderWithAutoSizeDiabled.png
new file mode 100644
index 000000000000..6adf11c37e61
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyzEditorPlaceholderWithAutoSizeDiabled.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyzEditorPlaceholderWithAutoSizeTextChanges.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyzEditorPlaceholderWithAutoSizeTextChanges.png
new file mode 100644
index 000000000000..ce29ba8bb959
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyzEditorPlaceholderWithAutoSizeTextChanges.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyzEditorTextWhenAutoSizeDisabled.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyzEditorTextWhenAutoSizeDisabled.png
new file mode 100644
index 000000000000..5075c0c8fe57
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyzEditorTextWhenAutoSizeDisabled.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyzEditorTextWhenAutoSizeTextChangesSet.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyzEditorTextWhenAutoSizeTextChangesSet.png
new file mode 100644
index 000000000000..2609d3b550b7
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Editor_VerifyzEditorTextWhenAutoSizeTextChangesSet.png differ
diff --git a/src/Controls/tests/TestCases.HostApp/CoreViews/CorePageView.cs b/src/Controls/tests/TestCases.HostApp/CoreViews/CorePageView.cs
index a145948019c1..1d967735cf43 100644
--- a/src/Controls/tests/TestCases.HostApp/CoreViews/CorePageView.cs
+++ b/src/Controls/tests/TestCases.HostApp/CoreViews/CorePageView.cs
@@ -105,6 +105,7 @@ public override string ToString()
 			new GalleryPageFactory(() => new ScrollViewControlPage(), "ScrollView Feature Matrix"),
 			new GalleryPageFactory(() => new GraphicsViewControlPage(), "GraphicsView Feature Matrix"),
 			new GalleryPageFactory(() => new EditorControlPage(), "Editor Feature Matrix"),
+			new GalleryPageFactory(() => new Material3_EditorControlPage(), "Editor Material3 Feature Matrix"),
 			new GalleryPageFactory(() => new ToolbarFeaturePage(), "Toolbar Feature Matrix"),
 			new GalleryPageFactory(() => new StackLayoutControlPage(), "StackLayout Feature Matrix"),
 			new GalleryPageFactory(() => new AbsoluteLayoutControlPage(), "AbsoluteLayout Feature Matrix"),
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EditorMaterial3/Material3_EditorControlPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EditorMaterial3/Material3_EditorControlPage.xaml
new file mode 100644
index 000000000000..5901ffe597d7
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EditorMaterial3/Material3_EditorControlPage.xaml
@@ -0,0 +1,110 @@
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+	xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+	xmlns:local="clr-namespace:Maui.Controls.Sample"
+	x:DataType="local:EditorViewModel"
+	x:Class="Maui.Controls.Sample.Material3_EditorControlMainPage">
+	<VerticalStackLayout Padding="20"
+		Spacing="8">
+		<Label Text="Editor Control"
+			FontSize="20"
+			Margin="0,0,0,50"
+			HorizontalOptions="Center"/>
+
+		<Grid x:Name="EditorGrid"
+			VerticalOptions="Start">
+			<Editor x:Name="EditorControl"
+				Text="{Binding Text}"
+				Placeholder="{Binding Placeholder}"
+				PlaceholderColor="{Binding PlaceholderColor}"
+				TextColor="{Binding TextColor}"
+				HorizontalTextAlignment="{Binding HorizontalTextAlignment}"
+				VerticalTextAlignment="{Binding VerticalTextAlignment}"
+				FontSize="{Binding FontSize}"
+				CharacterSpacing="{Binding CharacterSpacing}"
+				IsReadOnly="{Binding IsReadOnly}"
+				IsTextPredictionEnabled="{Binding IsTextPredictionEnabled}"
+				IsSpellCheckEnabled="{Binding IsSpellCheckEnabled}"
+				Shadow="{Binding EditorShadow}"
+				MaxLength="{Binding MaxLength}"
+				SelectionLength="{Binding SelectionLength}"
+				CursorPosition="{Binding CursorPosition, Mode=TwoWay}"
+				Keyboard="{Binding Keyboard}"
+				FontFamily="{Binding FontFamily}"
+				IsVisible="{Binding IsVisible}"
+				IsEnabled="{Binding IsEnabled}"
+				FlowDirection="{Binding FlowDirection}"
+				HeightRequest="{Binding HeightRequest}"
+				FontAttributes="{Binding FontAttributes}"
+				TextTransform="{Binding TextTransform}"
+				AutoSize="{Binding AutoSizeOption}"
+				TextChanged="EditorControl_TextChanged"
+				Completed="EditorControl_Completed"
+				Focused="EditorControl_Focused"
+				Unfocused="EditorControl_Unfocused"
+				AutomationId="TestEditor"/>
+		</Grid>
+
+		<Grid HeightRequest="130"/>
+
+		<Button Text="Options"
+			FontSize="11"
+			Clicked="NavigateToOptionsPage_Clicked"
+			AutomationId="OptionsButton"
+			Margin="0,10,0,0"/>
+
+		<Grid ColumnSpacing="10"
+			Margin="0,10,0,10">
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto"/>
+				<RowDefinition Height="Auto"/>
+			</Grid.RowDefinitions>
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="*"/>
+				<ColumnDefinition Width="*"/>
+			</Grid.ColumnDefinitions>
+			<Label Text="Selection Length:"
+				FontSize="11"
+				Grid.Row="0"
+				Grid.Column="0"/>
+			<Label Text="Cursor position:"
+				FontSize="11"
+				Grid.Row="0"
+				Grid.Column="1"/>
+			<Entry x:Name="SelectionLengthEntry"
+				Text="{Binding SelectionLength}"
+				AutomationId="SelectionLengthEntry"
+				TextChanged="SelectionLength_Clicked"
+				Grid.Row="1"
+				Grid.Column="0"/>
+			<Entry x:Name="CursorPositionEntry"
+				Text="{Binding CursorPosition}"
+				AutomationId="CursorPositionEntry"
+				Grid.Row="1"
+				Grid.Column="1"/>
+		</Grid>
+
+		<Button Text="Update Cursor Selection"
+			FontSize="11"
+			Clicked="OnUpdateCursorAndSelectionClicked"
+			AutomationId="UpdateCursorAndSelectionButton"/>
+
+		<Label Text="Events:"
+			FontSize="11"/>
+		<Label x:Name="TextChangedLabel"
+			Text="{Binding TextChangedText}"
+			AutomationId="TextChangedLabel"
+			FontSize="11"/>
+		<Label x:Name="CompletedLabel"
+			Text="{Binding CompletedText}"
+			AutomationId="CompletedLabel"
+			FontSize="11"/>
+		<Label x:Name="FocusedLabel"
+			Text="{Binding FocusedText}"
+			AutomationId="FocusedLabel"
+			FontSize="11"/>
+		<Label x:Name="UnfocusedLabel"
+			Text="{Binding UnfocusedText}"
+			AutomationId="UnfocusedLabel"
+			FontSize="11"/>
+	</VerticalStackLayout>
+</ContentPage>
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EditorMaterial3/Material3_EditorControlPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EditorMaterial3/Material3_EditorControlPage.xaml.cs
new file mode 100644
index 000000000000..2e63e6d3d14c
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EditorMaterial3/Material3_EditorControlPage.xaml.cs
@@ -0,0 +1,189 @@
+using System.ComponentModel;
+using Microsoft.Maui.Controls;
+
+namespace Maui.Controls.Sample;
+
+public class Material3_EditorControlPage : NavigationPage
+{
+	EditorViewModel _viewModel;
+
+	public Material3_EditorControlPage()
+	{
+		_viewModel = new EditorViewModel();
+		PushAsync(new Material3_EditorControlMainPage(_viewModel));
+	}
+}
+
+public partial class Material3_EditorControlMainPage : ContentPage
+{
+	EditorViewModel _viewModel;
+	Editor _editorControl;
+
+	public Material3_EditorControlMainPage(EditorViewModel viewModel)
+	{
+		InitializeComponent();
+		_viewModel = viewModel;
+		BindingContext = _viewModel;
+		_editorControl = EditorControl;
+		_editorControl.PropertyChanged += UpdateEditorControl;
+	}
+
+	async void NavigateToOptionsPage_Clicked(object sender, EventArgs e)
+	{
+		BindingContext = _viewModel = new EditorViewModel();
+		_viewModel.Text = "Test Editor";
+		_viewModel.Placeholder = "Enter text here";
+		_viewModel.VerticalTextAlignment = TextAlignment.End;
+		_viewModel.CursorPosition = 0;
+		_viewModel.SelectionLength = 0;
+		_viewModel.HeightRequest = -1;
+		ReInitializeEditor();
+		await Navigation.PushAsync(new EditorOptionsPage(_viewModel));
+	}
+
+	void ReInitializeEditor()
+	{
+		_editorControl.TextChanged -= EditorControl_TextChanged;
+		_editorControl.Completed -= EditorControl_Completed;
+		_editorControl.Focused -= EditorControl_Focused;
+		_editorControl.Unfocused -= EditorControl_Unfocused;
+		_editorControl.PropertyChanged -= UpdateEditorControl;
+
+		EditorGrid.Children.Clear();
+
+		var editor = new Editor
+		{
+			AutomationId = "TestEditor",
+		};
+
+		editor.SetBinding(Editor.TextProperty, nameof(EditorViewModel.Text));
+		editor.SetBinding(Editor.PlaceholderProperty, nameof(EditorViewModel.Placeholder));
+		editor.SetBinding(Editor.PlaceholderColorProperty, nameof(EditorViewModel.PlaceholderColor));
+		editor.SetBinding(Editor.TextColorProperty, nameof(EditorViewModel.TextColor));
+		editor.SetBinding(Editor.HorizontalTextAlignmentProperty, nameof(EditorViewModel.HorizontalTextAlignment));
+		editor.SetBinding(Editor.VerticalTextAlignmentProperty, nameof(EditorViewModel.VerticalTextAlignment));
+		editor.SetBinding(Editor.FontSizeProperty, nameof(EditorViewModel.FontSize));
+		editor.SetBinding(Editor.CharacterSpacingProperty, nameof(EditorViewModel.CharacterSpacing));
+		editor.SetBinding(Editor.IsReadOnlyProperty, nameof(EditorViewModel.IsReadOnly));
+		editor.SetBinding(Editor.IsTextPredictionEnabledProperty, nameof(EditorViewModel.IsTextPredictionEnabled));
+		editor.SetBinding(Editor.IsSpellCheckEnabledProperty, nameof(EditorViewModel.IsSpellCheckEnabled));
+		editor.SetBinding(Editor.ShadowProperty, nameof(EditorViewModel.EditorShadow));
+		editor.SetBinding(Editor.MaxLengthProperty, nameof(EditorViewModel.MaxLength));
+		editor.SetBinding(Editor.SelectionLengthProperty, nameof(EditorViewModel.SelectionLength));
+		editor.SetBinding(Editor.CursorPositionProperty, nameof(EditorViewModel.CursorPosition), BindingMode.TwoWay);
+		editor.SetBinding(Editor.KeyboardProperty, nameof(EditorViewModel.Keyboard));
+		editor.SetBinding(Editor.FontFamilyProperty, nameof(EditorViewModel.FontFamily));
+		editor.SetBinding(Editor.IsVisibleProperty, nameof(EditorViewModel.IsVisible));
+		editor.SetBinding(Editor.IsEnabledProperty, nameof(EditorViewModel.IsEnabled));
+		editor.SetBinding(Editor.FlowDirectionProperty, nameof(EditorViewModel.FlowDirection));
+		editor.SetBinding(Editor.HeightRequestProperty, nameof(EditorViewModel.HeightRequest));
+		editor.SetBinding(Editor.FontAttributesProperty, nameof(EditorViewModel.FontAttributes));
+		editor.SetBinding(Editor.TextTransformProperty, nameof(EditorViewModel.TextTransform));
+		editor.SetBinding(Editor.AutoSizeProperty, nameof(EditorViewModel.AutoSizeOption));
+
+		editor.PropertyChanged += UpdateEditorControl;
+
+		_editorControl = editor;
+		EditorGrid.Children.Add(editor);
+
+		editor.TextChanged += EditorControl_TextChanged;
+		editor.Completed += EditorControl_Completed;
+		editor.Focused += EditorControl_Focused;
+		editor.Unfocused += EditorControl_Unfocused;
+	}
+
+	void CursorPositionButton_Clicked(object sender, EventArgs e)
+	{
+		if (int.TryParse(CursorPositionEntry.Text, out int cursorPosition))
+		{
+			_viewModel.CursorPosition = cursorPosition;
+		}
+	}
+
+	void SelectionLength_Clicked(object sender, EventArgs e)
+	{
+		if (int.TryParse(SelectionLengthEntry.Text, out int selectionLength))
+		{
+			_viewModel.SelectionLength = selectionLength;
+		}
+	}
+
+	void OnUpdateCursorAndSelectionClicked(object sender, EventArgs e)
+	{
+		if (int.TryParse(CursorPositionEntry.Text, out int cursorPosition))
+		{
+			_editorControl.Focus();
+			_editorControl.CursorPosition = cursorPosition;
+
+			if (BindingContext is EditorViewModel vm)
+			{
+				vm.CursorPosition = cursorPosition;
+			}
+		}
+
+		if (int.TryParse(SelectionLengthEntry.Text, out int selectionLength))
+		{
+			_editorControl.Focus();
+			_editorControl.SelectionLength = selectionLength;
+
+			if (BindingContext is EditorViewModel vm)
+			{
+				vm.SelectionLength = selectionLength;
+			}
+		}
+		CursorPositionEntry.Text = _editorControl.CursorPosition.ToString();
+		SelectionLengthEntry.Text = _editorControl.SelectionLength.ToString();
+	}
+
+	void UpdateEditorControl(object sender, PropertyChangedEventArgs args)
+	{
+		if (args.PropertyName == Editor.CursorPositionProperty.PropertyName)
+		{
+			CursorPositionEntry.Text = _editorControl.CursorPosition.ToString();
+		}
+		else if (args.PropertyName == Editor.SelectionLengthProperty.PropertyName)
+		{
+			SelectionLengthEntry.Text = _editorControl.SelectionLength.ToString();
+		}
+	}
+
+	void EditorControl_TextChanged(object sender, TextChangedEventArgs e)
+	{
+		string eventInfo = $"TextChanged: Old='{e.OldTextValue}', New='{e.NewTextValue}'";
+
+		if (BindingContext is EditorViewModel vm)
+		{
+			vm.TextChangedText = eventInfo;
+		}
+	}
+
+	void EditorControl_Completed(object sender, EventArgs e)
+	{
+		string eventInfo = $"Completed: Event Triggered";
+
+		if (BindingContext is EditorViewModel vm)
+		{
+			vm.CompletedText = eventInfo;
+		}
+	}
+
+	void EditorControl_Focused(object sender, FocusEventArgs e)
+	{
+		string eventInfo = $"Focused: Event Triggered";
+
+		if (BindingContext is EditorViewModel vm)
+		{
+			vm.FocusedText = eventInfo;
+		}
+	}
+
+	private void EditorControl_Unfocused(object sender, FocusEventArgs e)
+	{
+		string eventInfo = $"Unfocused: Event Triggered";
+
+		if (BindingContext is EditorViewModel vm)
+		{
+			vm.UnfocusedText = eventInfo;
+		}
+	}
+}
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/Material3EditorFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/Material3EditorFeatureTests.cs
new file mode 100644
index 000000000000..1964d0929911
--- /dev/null
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/Material3EditorFeatureTests.cs
@@ -0,0 +1,563 @@
+// Material3 Editor tests use a separate HostApp page (EditorMaterial3ControlPage) that creates
+// a plain Editor control instead of UITestEditor. This ensures the Material3 EditorHandler2
+// is used instead of the M2 UITestEditorHandler.
+#if ANDROID
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests;
+
+public class Material3EditorFeatureTests : _GalleryUITest
+{
+	public override string GalleryPageName => "Editor Material3 Feature Matrix";
+
+	const int CropBottomValue = 1750;
+
+	public Material3EditorFeatureTests(TestDevice device)
+		: base(device)
+	{
+	}
+
+	[Test]
+	[Category(UITestCategories.Material3)]
+	public void Material3Editor_VerifyEditorTextWhenAlingnedHorizontally()
+	{
+		App.WaitForElement("Options");
+		App.Tap("Options");
+		App.WaitForElement("HCenter");
+		App.Tap("HCenter");
+		App.WaitForElement("Apply");
+		App.Tap("Apply");
+		App.WaitForElement("TestEditor");
+		VerifyScreenshot(cropBottom: CropBottomValue);
+	}
+
+	[Test]
+	[Category(UITestCategories.Material3)]
+	public void Material3Editor_VerifyEditorTextWhenAlingnedVertically()
+	{
+		App.Tap("Options");
+		App.WaitForElement("VEnd");
+		App.Tap("VEnd");
+		App.WaitForElement("Apply");
+		App.Tap("Apply");
+		App.WaitForElement("TestEditor");
+		VerifyScreenshot(cropBottom: CropBottomValue);
+	}
+
+	[Test]
+	[Category(UITestCategories.Material3)]
+	public void Material3Editor_VerifyEditorTextWhenFontFamilySetValue()
+	{
+		App.WaitForElement("Options");
+		App.Tap("Options");
+		App.WaitForElement("FontFamily");
+		App.EnterText("FontFamily", "MontserratBold");
+		App.WaitForElement("Apply");
+		App.Tap("Apply");
+		App.WaitForElement("TestEditor");
+		VerifyScreenshot(cropBottom: CropBottomValue);
+	}
+
+	[Test]
+	[Category(UITestCategories.Material3)]
+	public void Material3Editor_VerifyEditorTextWhenCharacterSpacingSetValues()
+	{
+		App.WaitForElement("Options");
+		App.Tap("Options");
+		App.WaitForElement("CharacterSpacing");
+		App.ClearText("CharacterSpacing");
+		App.EnterText("CharacterSpacing", "5");
+		App.WaitForElement("Apply");
+		App.Tap("Apply");
+		App.WaitForElement("TestEditor");
+		VerifyScreenshot(cropBottom: CropBottomValue);
+	}
+
+	[Test]
+	[Category(UITestCategories.Material3)]
+	public void Material3Editor_VerifyEditorHorizontalTextAlignmentBasedOnCharacterSpacing()
+	{
+		App.WaitForElement("Options");
+		App.Tap("Options");
+		App.WaitForElement("CharacterSpacing");
+		App.ClearText("CharacterSpacing");
+		App.EnterText("CharacterSpacing", "5");
+		App.WaitForElement("HCenter");
+		App.Tap("HCenter");
+		App.WaitForElement("Apply");
+		App.Tap("Apply");
+		App.WaitForElement("TestEditor");
+		VerifyScreenshot(cropBottom: CropBottomValue);
+	}
+
+	[Test]
+	[Category(UITestCategories.Material3)]
+	public void Material3Editor_VerifyEditorVerticalTextAlignmentBasedOnCharacterSpacing()
+	{
+		App.WaitForElement("Options");
+		App.Tap("Options");
+		App.WaitForElement("CharacterSpacing");
+		App.ClearText("CharacterSpacing");
+		App.EnterText("CharacterSpacing", "5");
+		App.WaitForElement("VEnd");
+		App.Tap("VEnd");
+		App.WaitForElement("Apply");
+		App.Tap("Apply");
+		App.WaitForElement("TestEditor");
+		VerifyScreenshot(cropBottom: CropBottomValue);
+	}
+
+	[Test]
+	[Category(UITestCategories.Material3)]
+	public void Material3Editor_VerifyEditorCharacterSpacingWhenFontFamily()
+	{
+		App.WaitForElement("Options");
+		App.Tap("Options");
+		App.WaitForElement("CharacterSpacing");
+		App.ClearText("CharacterSpacing");
+		App.EnterText("CharacterSpacing", "5");
+		App.WaitForElement("FontFamily");
+		App.EnterText("FontFamily", "MontserratBold");
+		App.WaitForElement("Apply");
+		App.Tap("Apply");
+		App.WaitForElement("TestEditor");
+		VerifyScreenshot(cropBottom: CropBottomValue);
+	}
+
+	[Test]
+	[Category(UITestCategories.Material3)]
+	public void Material3Editor_VerifyEditorCharacterSpacingWhenMaxLengthSet()
+	{
+		App.WaitForElement("Options");
+		App.Tap("Options");
+		App.WaitForElement("CharacterSpacing");
+		App.ClearText("CharacterSpacing");
+		App.EnterText("CharacterSpacing", "5");
+		App.WaitForElement("TextEntryChanged");
+		App.ClearText("TextEntryChanged");
+		App.EnterText("TextEntryChanged", "Test Entered Set MaxLenght");
+		App.WaitForElement("MaxLength");
+		App.ClearText("MaxLength");
+		App.EnterText("MaxLength", "6");
+		App.WaitForElement("Apply");
+		App.Tap("Apply");
+		App.WaitForElement("TestEditor");
+		VerifyScreenshot(cropBottom: CropBottomValue);
+	}
+
+	[Test]
+	[Category(UITestCategories.Material3)]
+	public void Material3Editor_VerifyEditorHorizontalTextAlignmentWhenVerticalTextAlignmentSet()
+	{
+		App.WaitForElement("Options");
+		App.Tap("Options");
+		App.WaitForElement("VEnd");
+		App.Tap("VEnd");
+		App.WaitForElement("HEnd");
+		App.Tap("HEnd");
+		App.WaitForElement("Apply");
+		App.Tap("Apply");
+		App.WaitForElement("TestEditor");
+		VerifyScreenshot(cropBottom: CropBottomValue);
+	}
+
+	[Test]
+	[Category(UITestCategories.Material3)]
+	public void Material3Editor_VerifyEditorTextWhenTextColorSetCorrectly()
+	{
+		App.WaitForElement("Options");
+		App.Tap("Options");
+		App.WaitForElement("TextColorRed");
+		App.Tap("TextColorRed");
+		App.WaitForElement("Apply");
+		App.Tap("Apply");
+		App.WaitForElement("TestEditor");
+		App.Tap("Editor Control"); // Add an additional tap to make the Editor control unfocus.
+		VerifyScreenshot(cropBottom: CropBottomValue);
+	}
+
+	[Test]
+	[Category(UITestCategories.Material3)]
+	public void Material3Editor_VerifyEditorTextWhenFontSizeSetCorrectly()
+	{
+		App.WaitForElement("Options");
+		App.Tap("Options");
+		App.WaitForElement("FontSizeEntry");
+		App.ClearText("FontSizeEntry");
+		App.EnterText("FontSizeEntry", "20");
+		App.WaitForElement("Apply");
+		App.Tap("Apply");
+		App.WaitForElement("TestEditor");
+		VerifyScreenshot(cropBottom: CropBottomValue);
+	}
+
+#if TEST_FAILS_ON_ANDROID //related issue link: https://github.com/dotnet/maui/issues/29833
+	[Test]
+	[Category(UITestCategories.Material3)]
+	public void Material3Editor_VerifyEditorTextWhenIsSpellCheckEnabledTrueOrFalse()
+	{
+		App.WaitForElement("Options");
+		App.Tap("Options");
+		App.WaitForElement("SpellCheckTrue");
+		App.Tap("SpellCheckTrue");
+		App.WaitForElement("Apply");
+		App.Tap("Apply");
+		App.WaitForElement("TestEditor");
+		App.ClearText("TestEditor");
+		App.EnterText("TestEditor", "Testig");
+		App.EnterText("TestEditor", " ");
+		VerifyScreenshotWithKeyboardHandling();
+	}
+#endif
+
+#if TEST_FAILS_ON_ANDROID //keybord type is not supported on Android, related issue: https://github.com/dotnet/maui/issues/26968
+	[Test]
+	[Category(UITestCategories.Material3)]
+	public void Material3Editor_VerifyEditorTextWhenKeyboardTypeSet()
+	{
+		App.WaitForElement("Options");
+		App.Tap("Options");
+		App.WaitForElement("Numeric");
+		App.Tap("Numeric");
+		App.WaitForElement("Apply");
+		App.Tap("Apply");
+		App.WaitForElement("TestEditor");
+		App.Tap("TestEditor");
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+	}
+
+	[Test]
+	[Category(UITestCategories.Material3)]
+	public void Material3Editor_VerifyEditorTextWhenReturnTypeSet()
+	{
+		App.WaitForElement("Options");
+		App.Tap("Options");
+		App.WaitForElement("Search");
+		App.Tap("Search");
+		App.WaitForElement("Apply");
+		App.Tap("Apply");
+		App.WaitForElement("TestEditor");
+		App.Tap("TestEditor");
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+	}
+#endif
+
+	[Test]
+	[Category(UITestCategories.Material3)]
+	public void Material3Editor_VerifyEditorControlWhenFlowDirectionSet()
+	{
+		App.WaitForElement("Options");
+		App.Tap("Options");
+		App.WaitForElement("FlowDirectionRightToLeft");
+		App.Tap("FlowDirectionRightToLeft");
+		App.WaitForElement("Apply");
+		App.Tap("Apply");
+		App.WaitForElement("TestEditor");
+		VerifyScreenshot(cropBottom: CropBottomValue);
+	}
+
+	[Test]
+	[Category(UITestCategories.Material3)]
+	public void Material3Editor_VerifyEditorPlaceholderWhenFlowDirectionSet()
+	{
+		App.WaitForElement("Options");
+		App.Tap("Options");
+		App.WaitForElement("FlowDirectionRightToLeft");
+		App.Tap("FlowDirectionRightToLeft");
+		App.WaitForElement("PlaceholderText");
+		App.ClearText("PlaceholderText");
+		App.EnterText("PlaceholderText", "Enter your name");
+		App.WaitForElement("TextEntryChanged");
+		App.ClearText("TextEntryChanged");
+		App.WaitForElement("Apply");
+		App.Tap("Apply");
+		App.WaitForElement("TestEditor");
+		VerifyScreenshot(cropBottom: CropBottomValue);
+	}
+
+	[Test]
+	[Category(UITestCategories.Material3)]
+	public void Material3Editor_VerifyEditorControlWhenPlaceholderTextSet()
+	{
+		App.WaitForElement("Options");
+		App.Tap("Options");
+		App.WaitForElement("PlaceholderText");
+		App.ClearText("PlaceholderText");
+		App.EnterText("PlaceholderText", "Enter your name");
+		App.WaitForElement("TextEntryChanged");
+		App.ClearText("TextEntryChanged");
+		App.WaitForElement("Apply");
+		App.Tap("Apply");
+		VerifyScreenshot(cropBottom: CropBottomValue);
+	}
+
+	[Test]
+	[Category(UITestCategories.Material3)]
+	public void Material3Editor_VerifyEditorControlWhenPlaceholderColorSet()
+	{
+		App.WaitForElement("Options");
+		App.Tap("Options");
+		App.WaitForElement("PlaceholderColorRed");
+		App.Tap("PlaceholderColorRed");
+		App.WaitForElement("PlaceholderText");
+		App.ClearText("PlaceholderText");
+		App.EnterText("PlaceholderText", "Enter your name");
+		App.WaitForElement("TextEntryChanged");
+		App.ClearText("TextEntryChanged");
+		App.WaitForElement("Apply");
+		App.Tap("Apply");
+		App.WaitForElement("TestEditor");
+		VerifyScreenshot(cropBottom: CropBottomValue);
+	}
+
+	[Test]
+	[Category(UITestCategories.Material3)]
+	public void Material3Editor_VerifyEditorTextWhenFontAttributesSet()
+	{
+		App.WaitForElement("Options");
+		App.Tap("Options");
+		App.WaitForElement("FontAttributesBold");
+		App.Tap("FontAttributesBold");
+		App.WaitForElement("Apply");
+		App.Tap("Apply");
+		App.WaitForElement("TestEditor");
+		VerifyScreenshot(cropBottom: CropBottomValue);
+	}
+
+	[Test]
+	[Category(UITestCategories.Material3)]
+	public void Material3Editor_VerifyzEditorTextWhenAutoSizeTextChangesSet()
+	{
+		App.WaitForElement("Options");
+		App.Tap("Options");
+		App.WaitForElement("AutoSizeTextChanges");
+		App.Tap("AutoSizeTextChanges");
+		App.WaitForElement("TextEntryChanged");
+		App.ClearText("TextEntryChanged");
+		App.EnterText("TextEntryChanged", "When auto-resizing is enabled, the height of the Editor will increase when the user fills it with text, and the height will decrease as the user deletes text. This can be used to ensure that Editor objects in a DataTemplate.");
+		App.WaitForElement("Apply");
+		App.Tap("Apply");
+		App.WaitForElement("TestEditor");
+		VerifyScreenshotWithKeyboardHandling();
+	}
+
+	[Test]
+	[Category(UITestCategories.Material3)]
+	public void Material3Editor_VerifyzEditorTextWhenAutoSizeDisabled()
+	{
+		App.WaitForElement("Options");
+		App.Tap("Options");
+		App.WaitForElement("TextEntryChanged");
+		App.ClearText("TextEntryChanged");
+		App.EnterText("TextEntryChanged", "When auto-resizing is enabled, the height of the Editor will increase when the user fills it with text, and the height will decrease as the user deletes text. This can be used to ensure that Editor objects in a DataTemplate.");
+		App.WaitForElement("Apply");
+		App.Tap("Apply");
+		App.WaitForElement("TestEditor");
+		VerifyScreenshotWithKeyboardHandling();
+	}
+
+	[Test]
+	[Category(UITestCategories.Material3)]
+	public void Material3Editor_VerifyEditor_WithShadow()
+	{
+		App.WaitForElement("Options");
+		App.Tap("Options");
+
+		App.WaitForElement("ShadowCheckBox");
+		App.Tap("ShadowCheckBox");
+
+		App.WaitForElement("Apply");
+		App.Tap("Apply");
+
+		VerifyScreenshot(cropBottom: CropBottomValue);
+	}
+
+	[Test]
+	[Category(UITestCategories.Material3)]
+	public void Material3Editor_VerifyEditorPlaceholderWithShadow()
+	{
+		App.WaitForElement("Options");
+		App.Tap("Options");
+		App.WaitForElement("ShadowCheckBox");
+		App.Tap("ShadowCheckBox");
+		App.WaitForElement("PlaceholderText");
+		App.ClearText("PlaceholderText");
+		App.EnterText("PlaceholderText", "Enter your name");
+		App.WaitForElement("TextEntryChanged");
+		App.ClearText("TextEntryChanged");
+		App.WaitForElement("Apply");
+		App.Tap("Apply");
+		App.WaitForElement("TestEditor");
+		VerifyScreenshot(cropBottom: CropBottomValue);
+	}
+
+	[Test]
+	[Category(UITestCategories.Material3)]
+	public void Material3Editor_VerifyEditorPlaceholderWithHorizontalAlignment()
+	{
+		App.WaitForElement("Options");
+		App.Tap("Options");
+		App.WaitForElement("HCenter");
+		App.Tap("HCenter");
+		App.WaitForElement("PlaceholderText");
+		App.ClearText("PlaceholderText");
+		App.EnterText("PlaceholderText", "Enter your name");
+		App.WaitForElement("TextEntryChanged");
+		App.ClearText("TextEntryChanged");
+		App.WaitForElement("Apply");
+		App.Tap("Apply");
+		App.WaitForElement("TestEditor");
+		VerifyScreenshot(cropBottom: CropBottomValue);
+	}
+
+	[Test]
+	[Category(UITestCategories.Material3)]
+	public void Material3Editor_VerifyEditorPlaceholderWithVerticalAlignment()
+	{
+		App.WaitForElement("Options");
+		App.Tap("Options");
+		App.WaitForElement("VStart");
+		App.Tap("VStart");
+		App.WaitForElement("PlaceholderText");
+		App.ClearText("PlaceholderText");
+		App.EnterText("PlaceholderText", "Enter your name");
+		App.WaitForElement("TextEntryChanged");
+		App.ClearText("TextEntryChanged");
+		App.WaitForElement("Apply");
+		App.Tap("Apply");
+		App.WaitForElement("TestEditor");
+		VerifyScreenshot(cropBottom: CropBottomValue);
+	}
+
+	[Test]
+	[Category(UITestCategories.Material3)]
+	public void Material3Editor_VerifyEditorPlaceholderWithCharacterSpacing()
+	{
+		App.WaitForElement("Options");
+		App.Tap("Options");
+		App.WaitForElement("CharacterSpacing");
+		App.ClearText("CharacterSpacing");
+		App.EnterText("CharacterSpacing", "5");
+		App.WaitForElement("PlaceholderText");
+		App.ClearText("PlaceholderText");
+		App.EnterText("PlaceholderText", "Enter your name");
+		App.WaitForElement("TextEntryChanged");
+		App.ClearText("TextEntryChanged");
+		App.WaitForElement("Apply");
+		App.Tap("Apply");
+		App.WaitForElement("TestEditor");
+		VerifyScreenshot(cropBottom: CropBottomValue);
+	}
+
+	[Test]
+	[Category(UITestCategories.Material3)]
+	public void Material3Editor_VerifyEditorPlaceholderWithFontFamily()
+	{
+		App.WaitForElement("Options");
+		App.Tap("Options");
+		App.WaitForElement("FontFamily");
+		App.EnterText("FontFamily", "MontserratBold");
+		App.WaitForElement("PlaceholderText");
+		App.ClearText("PlaceholderText");
+		App.EnterText("PlaceholderText", "Enter your name");
+		App.WaitForElement("TextEntryChanged");
+		App.ClearText("TextEntryChanged");
+		App.WaitForElement("Apply");
+		App.Tap("Apply");
+		App.WaitForElement("TestEditor");
+		VerifyScreenshot(cropBottom: CropBottomValue);
+	}
+
+	[Test]
+	[Category(UITestCategories.Material3)]
+	public void Material3Editor_VerifyEditorPlaceholderWithFontSize()
+	{
+		App.WaitForElement("Options");
+		App.Tap("Options");
+		App.WaitForElement("FontSizeEntry");
+		App.ClearText("FontSizeEntry");
+		App.EnterText("FontSizeEntry", "20");
+		App.WaitForElement("PlaceholderText");
+		App.ClearText("PlaceholderText");
+		App.EnterText("PlaceholderText", "Enter your name");
+		App.WaitForElement("TextEntryChanged");
+		App.ClearText("TextEntryChanged");
+		App.WaitForElement("Apply");
+		App.Tap("Apply");
+		App.WaitForElement("TestEditor");
+		VerifyScreenshot(cropBottom: CropBottomValue);
+	}
+
+	[Test]
+	[Category(UITestCategories.Material3)]
+	public void Material3Editor_VerifyEditorPlaceholderWithFontAttributes()
+	{
+		App.WaitForElement("Options");
+		App.Tap("Options");
+		App.WaitForElement("FontAttributesItalic");
+		App.Tap("FontAttributesItalic");
+		App.WaitForElement("PlaceholderText");
+		App.ClearText("PlaceholderText");
+		App.EnterText("PlaceholderText", "Enter your name");
+		App.WaitForElement("TextEntryChanged");
+		App.ClearText("TextEntryChanged");
+		App.WaitForElement("Apply");
+		App.Tap("Apply");
+		App.WaitForElement("TestEditor");
+		VerifyScreenshot(cropBottom: CropBottomValue);
+	}
+
+	[Test]
+	[Category(UITestCategories.Material3)]
+	public void Material3Editor_VerifyzEditorPlaceholderWithAutoSizeDiabled()
+	{
+		App.WaitForElement("Options");
+		App.Tap("Options");
+		App.WaitForElement("PlaceholderText");
+		App.ClearText("PlaceholderText");
+		App.EnterText("PlaceholderText", "When auto-resizing is enabled, the height of the Editor will increase when the user fills it with text, and the height will decrease as the user deletes text. This can be used to ensure that Editor objects in a DataTemplate.");
+		App.WaitForElement("TextEntryChanged");
+		App.ClearText("TextEntryChanged");
+		App.WaitForElement("Apply");
+		App.Tap("Apply");
+		App.WaitForElement("TestEditor");
+		VerifyScreenshot(cropBottom: CropBottomValue);
+	}
+
+	[Test]
+	[Category(UITestCategories.Material3)]
+	public void Material3Editor_VerifyzEditorPlaceholderWithAutoSizeTextChanges()
+	{
+		App.WaitForElement("Options");
+		App.Tap("Options");
+		App.WaitForElement("AutoSizeTextChanges");
+		App.Tap("AutoSizeTextChanges");
+		App.WaitForElement("PlaceholderText");
+		App.ClearText("PlaceholderText");
+		App.EnterText("PlaceholderText", "When auto-resizing is enabled, the height of the Editor will increase when the user fills it with text, and the height will decrease as the user deletes text. This can be used to ensure that Editor objects in a DataTemplate.");
+		App.WaitForElement("TextEntryChanged");
+		App.ClearText("TextEntryChanged");
+		App.WaitForElement("Apply");
+		App.Tap("Apply");
+		App.WaitForElement("TestEditor");
+		VerifyScreenshot(cropBottom: CropBottomValue);
+	}
+
+	/// <summary>
+	/// Helper method to handle keyboard visibility and take a screenshot with appropriate cropping
+	/// </summary>
+	/// <param name="screenshotName">Optional name for the screenshot</param>
+	void VerifyScreenshotWithKeyboardHandling(string? screenshotName = null)
+	{
+		if (App.IsKeyboardShown())
+			App.DismissKeyboard();
+
+		if (string.IsNullOrEmpty(screenshotName))
+			VerifyScreenshot(cropBottom: CropBottomValue);
+		else
+			VerifyScreenshot(screenshotName, cropBottom: CropBottomValue);
+	}
+}
+#endif
diff --git a/src/Core/src/Handlers/Editor/EditorHandler2.Android.cs b/src/Core/src/Handlers/Editor/EditorHandler2.Android.cs
new file mode 100644
index 000000000000..e8794a320301
--- /dev/null
+++ b/src/Core/src/Handlers/Editor/EditorHandler2.Android.cs
@@ -0,0 +1,221 @@
+using System;
+using Android.Text;
+using Android.Views;
+using Android.Views.InputMethods;
+using Microsoft.Maui.Graphics;
+using static Android.Views.View;
+
+namespace Microsoft.Maui.Handlers;
+
+// TODO: Material3 - make it public in .net 11
+internal class EditorHandler2 : ViewHandler<IEditor, MauiMaterialEditText>
+{
+	bool _set;
+
+	public static PropertyMapper<IEditor, EditorHandler2> Mapper =
+		new(ViewMapper)
+		{
+			[nameof(IEditor.Background)] = MapBackground,
+			[nameof(IEditor.CharacterSpacing)] = MapCharacterSpacing,
+			[nameof(IEditor.Font)] = MapFont,
+			[nameof(IEditor.IsReadOnly)] = MapIsReadOnly,
+			[nameof(IEditor.IsTextPredictionEnabled)] = MapIsTextPredictionEnabled,
+			[nameof(IEditor.IsSpellCheckEnabled)] = MapIsSpellCheckEnabled,
+			[nameof(IEditor.MaxLength)] = MapMaxLength,
+			[nameof(IEditor.Placeholder)] = MapPlaceholder,
+			[nameof(IEditor.PlaceholderColor)] = MapPlaceholderColor,
+			[nameof(IEditor.Text)] = MapText,
+			[nameof(IEditor.TextColor)] = MapTextColor,
+			[nameof(IEditor.HorizontalTextAlignment)] = MapHorizontalTextAlignment,
+			[nameof(IEditor.VerticalTextAlignment)] = MapVerticalTextAlignment,
+			[nameof(IEditor.Keyboard)] = MapKeyboard,
+			[nameof(IEditor.CursorPosition)] = MapCursorPosition,
+			[nameof(IEditor.SelectionLength)] = MapSelectionLength,
+		};
+
+	public static CommandMapper<IEditor, EditorHandler2> CommandMapper =
+		new(ViewCommandMapper)
+		{
+			[nameof(IEditor.Focus)] = MapFocus
+		};
+
+	public EditorHandler2() : base(Mapper, CommandMapper)
+	{
+	}
+
+	protected override MauiMaterialEditText CreatePlatformView()
+	{
+		var editText = new MauiMaterialEditText(Context)
+		{
+			ImeOptions = ImeAction.Done,
+			Gravity = GravityFlags.Top,
+			TextAlignment = global::Android.Views.TextAlignment.ViewStart,
+		};
+
+		editText.SetSingleLine(false);
+		editText.SetHorizontallyScrolling(false);
+
+		return editText;
+	}
+
+	public override void SetVirtualView(IView view)
+	{
+		base.SetVirtualView(view);
+
+		if (!_set)
+		{
+			PlatformView.SelectionChanged += OnSelectionChanged;
+		}
+
+		_set = true;
+	}
+
+	protected override void ConnectHandler(MauiMaterialEditText platformView)
+	{
+		platformView.TextChanged += OnTextChanged;
+		platformView.FocusChange += OnFocusChange;
+	}
+
+	protected override void DisconnectHandler(MauiMaterialEditText platformView)
+	{
+		platformView.TextChanged -= OnTextChanged;
+		platformView.FocusChange -= OnFocusChange;
+
+		if (_set)
+		{
+			platformView.SelectionChanged -= OnSelectionChanged;
+		}
+
+		_set = false;
+	}
+
+	public static void MapBackground(EditorHandler2 handler, IEditor editor)
+	{
+		handler.PlatformView?.UpdateBackground(editor);
+	}
+
+	public static void MapText(EditorHandler2 handler, IEditor editor)
+	{
+		handler.PlatformView?.UpdateText(editor);
+	}
+
+	public static void MapTextColor(EditorHandler2 handler, IEditor editor)
+	{
+		handler.PlatformView?.UpdateTextColor(editor);
+	}
+
+	public static void MapPlaceholder(EditorHandler2 handler, IEditor editor)
+	{
+		handler.PlatformView?.UpdatePlaceholder(editor);
+	}
+
+	public static void MapPlaceholderColor(EditorHandler2 handler, IEditor editor)
+	{
+		handler.PlatformView?.UpdatePlaceholderColor(editor);
+	}
+
+	public static void MapCharacterSpacing(EditorHandler2 handler, IEditor editor)
+	{
+		handler.PlatformView?.UpdateCharacterSpacing(editor);
+	}
+
+	public static void MapMaxLength(EditorHandler2 handler, IEditor editor)
+	{
+		handler.PlatformView?.UpdateMaxLength(editor);
+	}
+
+	public static void MapIsReadOnly(EditorHandler2 handler, IEditor editor)
+	{
+		handler.PlatformView?.UpdateIsReadOnly(editor);
+	}
+
+	public static void MapIsTextPredictionEnabled(EditorHandler2 handler, IEditor editor)
+	{
+		handler.PlatformView?.UpdateIsTextPredictionEnabled(editor);
+	}
+
+	public static void MapIsSpellCheckEnabled(EditorHandler2 handler, IEditor editor)
+	{
+		handler.PlatformView?.UpdateIsSpellCheckEnabled(editor);
+	}
+
+	public static void MapFont(EditorHandler2 handler, IEditor editor)
+	{
+		handler.PlatformView?.UpdateFont(editor, handler.GetRequiredService<IFontManager>());
+	}
+
+	public static void MapHorizontalTextAlignment(EditorHandler2 handler, IEditor editor)
+	{
+		handler.PlatformView?.UpdateHorizontalTextAlignment(editor);
+	}
+
+	public static void MapVerticalTextAlignment(EditorHandler2 handler, IEditor editor)
+	{
+		handler.PlatformView?.UpdateVerticalTextAlignment(editor);
+	}
+
+	public static void MapKeyboard(EditorHandler2 handler, IEditor editor)
+	{
+		handler.UpdateValue(nameof(IEditor.Text));
+
+		handler.PlatformView?.UpdateKeyboard(editor);
+	}
+
+	public static void MapCursorPosition(EditorHandler2 handler, ITextInput editor)
+	{
+		handler.PlatformView?.UpdateCursorPosition(editor);
+	}
+
+	public static void MapSelectionLength(EditorHandler2 handler, ITextInput editor)
+	{
+		handler.PlatformView?.UpdateSelectionLength(editor);
+	}
+
+	static void MapFocus(EditorHandler2 handler, IEditor editor, object? args)
+	{
+		if (args is FocusRequest request)
+		{
+			handler.PlatformView.Focus(request);
+		}
+	}
+
+	void OnTextChanged(object? sender, TextChangedEventArgs e)
+	{
+		// Let the mapping know that the update is coming from changes to the platform control
+		DataFlowDirection = DataFlowDirection.FromPlatform;
+		VirtualView?.UpdateText(e);
+
+		// Reset to the default direction
+		DataFlowDirection = DataFlowDirection.ToPlatform;
+	}
+
+	void OnFocusChange(object? sender, FocusChangeEventArgs e)
+	{
+		if (!e.HasFocus)
+		{
+			VirtualView?.Completed();
+		}
+	}
+
+	void OnSelectionChanged(object? sender, EventArgs e)
+	{
+		var cursorPosition = PlatformView.GetCursorPosition();
+		var selectedTextLength = PlatformView.GetSelectedTextLength();
+
+		if (VirtualView.CursorPosition != cursorPosition)
+		{
+			VirtualView.CursorPosition = cursorPosition;
+		}
+
+		if (VirtualView.SelectionLength != selectedTextLength)
+		{
+			VirtualView.SelectionLength = selectedTextLength;
+		}
+	}
+
+	public override void PlatformArrange(Rect frame)
+	{
+		this.PrepareForTextViewArrange(frame);
+		base.PlatformArrange(frame);
+	}
+}
diff --git a/src/Core/src/Platform/Android/Material3Controls/MauiMaterialEditText.cs b/src/Core/src/Platform/Android/Material3Controls/MauiMaterialEditText.cs
new file mode 100644
index 000000000000..6adf5a48d10b
--- /dev/null
+++ b/src/Core/src/Platform/Android/Material3Controls/MauiMaterialEditText.cs
@@ -0,0 +1,36 @@
+using System;
+using Android.Content;
+using Android.Runtime;
+using Android.Util;
+using Google.Android.Material.TextField;
+
+namespace Microsoft.Maui.Platform;
+
+// TODO: Material3 - make it public in .net 11
+internal class MauiMaterialEditText : TextInputEditText
+{
+	public event EventHandler? SelectionChanged;
+
+	public MauiMaterialEditText(Context context) : base(MauiMaterialContextThemeWrapper.Create(context))
+	{
+	}
+
+	protected MauiMaterialEditText(nint javaReference, JniHandleOwnership transfer) : base(javaReference, transfer)
+	{
+	}
+
+	public MauiMaterialEditText(Context context, IAttributeSet? attrs) : base(MauiMaterialContextThemeWrapper.Create(context), attrs)
+	{
+	}
+
+	public MauiMaterialEditText(Context context, IAttributeSet? attrs, int defStyleAttr) : base(MauiMaterialContextThemeWrapper.Create(context), attrs, defStyleAttr)
+	{
+	}
+
+	protected override void OnSelectionChanged(int selStart, int selEnd)
+	{
+		base.OnSelectionChanged(selStart, selEnd);
+
+		SelectionChanged?.Invoke(this, EventArgs.Empty);
+	}
+}