From a5f3531aa7acbfe641b1f22e62de96095a6292a7 Mon Sep 17 00:00:00 2001
From: Alberto Aldegheri <albyrock87@gmail.com>
Date: Sat, 9 Aug 2025 18:00:34 +0200
Subject: [PATCH] Improve label/entry/button mapping perf

---
 src/Controls/src/Core/Entry/Entry.Mapper.cs   |  13 +-
 src/Controls/src/Core/Entry/Entry.iOS.cs      |   9 +-
 src/Controls/src/Core/Label/Label.Mapper.cs   |  12 +-
 src/Controls/src/Core/Label/Label.iOS.cs      |   7 +-
 .../Button/ButtonControlPage.xaml             |   9 +-
 .../Button/ButtonControlPage.xaml.cs          |  15 ++
 .../EntryControl/EntryControlPage.xaml        |   8 +-
 .../EntryControl/EntryControlPage.xaml.cs     |  17 +++
 .../EntryControl/EntryOptionsPage.xaml        |   1 +
 .../FeatureMatrix/Label/LabelControlPage.xaml |   6 +-
 .../Label/LabelControlPage.xaml.cs            |   8 ++
 .../Tests/FeatureMatrix/ButtonFeatureTests.cs |  41 ++++++
 .../Tests/FeatureMatrix/EntryFeatureTests.cs  | 111 +++++++++++++++
 .../Tests/FeatureMatrix/LabelFeatureTests.cs  | 134 ++++++++++++++++++
 src/Core/src/Handlers/Button/ButtonHandler.cs |   2 +-
 .../src/Handlers/Button/ButtonHandler.iOS.cs  |   7 +-
 src/Core/src/Handlers/Entry/EntryHandler.cs   |  22 +--
 .../src/Handlers/Entry/EntryHandler.iOS.cs    |  15 +-
 src/Core/src/Handlers/Label/LabelHandler.cs   |  26 ++--
 .../src/Handlers/Label/LabelHandler.iOS.cs    |   7 +-
 20 files changed, 430 insertions(+), 40 deletions(-)

diff --git a/src/Controls/src/Core/Entry/Entry.Mapper.cs b/src/Controls/src/Core/Entry/Entry.Mapper.cs
index 413f01b94078..6dec362d909f 100644
--- a/src/Controls/src/Core/Entry/Entry.Mapper.cs
+++ b/src/Controls/src/Core/Entry/Entry.Mapper.cs
@@ -18,7 +18,7 @@ public partial class Entry
 			EntryHandler.Mapper.ReplaceMapping<Entry, IEntryHandler>(PlatformConfiguration.iOSSpecific.Entry.AdjustsFontSizeToFitWidthProperty.PropertyName, MapAdjustsFontSizeToFitWidth);
 #endif
 			EntryHandler.Mapper.ReplaceMapping<Entry, IEntryHandler>(nameof(Text), MapText);
-			EntryHandler.Mapper.ReplaceMapping<Entry, IEntryHandler>(nameof(TextTransform), MapText);
+			EntryHandler.Mapper.ReplaceMapping<Entry, IEntryHandler>(nameof(TextTransform), MapTextTransform);
 
 #if IOS || ANDROID
 			EntryHandler.Mapper.AppendToMapping(nameof(VisualElement.IsFocused), InputView.MapIsFocused);
@@ -28,5 +28,16 @@ public partial class Entry
 			EntryHandler.CommandMapper.PrependToMapping(nameof(IEntry.Focus), InputView.MapFocus);
 #endif
 		}
+
+		static void MapTextTransform(IEntryHandler handler, Entry label)
+		{
+			if (label.IsConnectingHandler())
+			{
+				// If we're connecting the handler, we don't want to map the text multiple times.
+				return;
+			}
+
+			MapText(handler, label);
+		}
 	}
 }
diff --git a/src/Controls/src/Core/Entry/Entry.iOS.cs b/src/Controls/src/Core/Entry/Entry.iOS.cs
index 25a6281483a1..20407ae151b3 100644
--- a/src/Controls/src/Core/Entry/Entry.iOS.cs
+++ b/src/Controls/src/Core/Entry/Entry.iOS.cs
@@ -16,7 +16,14 @@ public static void MapAdjustsFontSizeToFitWidth(IEntryHandler handler, Entry ent
 		public static void MapText(IEntryHandler handler, Entry entry)
 		{
 			Platform.TextExtensions.UpdateText(handler.PlatformView, entry);
-			EntryHandler.MapFormatting(handler, entry);
+
+			if (!handler.IsConnectingHandler())
+			{
+				// If we're not connecting the handler, we need to update the text formatting
+				// This is because the text may have changed, and we need to ensure that
+				// any attributed string formatting is applied correctly.
+				EntryHandler.MapFormatting(handler, entry);
+			}
 		}
 
 		public static void MapCursorColor(EntryHandler handler, Entry entry) =>
diff --git a/src/Controls/src/Core/Label/Label.Mapper.cs b/src/Controls/src/Core/Label/Label.Mapper.cs
index fdc6a046daea..3057ce3cf6d2 100644
--- a/src/Controls/src/Core/Label/Label.Mapper.cs
+++ b/src/Controls/src/Core/Label/Label.Mapper.cs
@@ -57,7 +57,10 @@ static void MapTextTransform(ILabelHandler handler, Label label) =>
 		static void MapFormattedText(ILabelHandler handler, Label label)
 		{
 			if (label.IsConnectingHandler())
+			{
+				// If we're connecting the handler, we don't want to map the text multiple times.
 				return;
+			}
 
 			MapText(handler, label);
 		}
@@ -139,9 +142,12 @@ static void MapFont(ILabelHandler handler, Label label, Action<IElementHandler,
 		{
 			if (label.HasFormattedTextSpans)
 			{
-				// if there is formatted text,
-				// then we re-apply the whole formatted text
-				handler.UpdateValue(nameof(FormattedText));
+				if (!handler.IsConnectingHandler())
+				{
+					// if there is formatted text,
+					// then we re-apply the whole formatted text
+					handler.UpdateValue(nameof(FormattedText));
+				}
 			}
 			else if (label.TextType == TextType.Text || !IsDefaultFont(label))
 			{
diff --git a/src/Controls/src/Core/Label/Label.iOS.cs b/src/Controls/src/Core/Label/Label.iOS.cs
index acecf544543f..f7348318405a 100644
--- a/src/Controls/src/Core/Label/Label.iOS.cs
+++ b/src/Controls/src/Core/Label/Label.iOS.cs
@@ -1,5 +1,4 @@
 #nullable disable
-using System;
 using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 using UIKit;
@@ -23,7 +22,11 @@ public static void MapText(ILabelHandler handler, Label label)
 		{
 			Platform.LabelExtensions.UpdateText(handler.PlatformView, label);
 
-			MapFormatting(handler, label);
+			if (!handler.IsConnectingHandler())
+			{
+				// Any text update requires that we update any attributed string formatting
+				MapFormatting(handler, label);
+			}
 		}
 
 		public static void MapLineBreakMode(ILabelHandler handler, Label label)
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Button/ButtonControlPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Button/ButtonControlPage.xaml
index e2ee55b2a38e..fdc41d00715d 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Button/ButtonControlPage.xaml
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Button/ButtonControlPage.xaml
@@ -55,12 +55,17 @@
               </Button>
 
               <Label Grid.Row="1"
-                     Text="Clicked Event: "/>
+                     Text="Clicked Event: "
+                     AutomationId="MainLabel">
+                <Label.GestureRecognizers>
+                  <TapGestureRecognizer Tapped="MainLabel_Tapped"/>
+                </Label.GestureRecognizers>
+              </Label>
               <Label Grid.Row="1"
                      Grid.Column="1"
                      x:Name="ClickedEventLabel"
                      AutomationId="ClickedEventLabel"/>
-
+              
               <Label Grid.Row="2"
                      Text="Pressed Event: "/>
               <Label Grid.Row="2"
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Button/ButtonControlPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Button/ButtonControlPage.xaml.cs
index 2a537a15497b..5b6ee35d1b0a 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Button/ButtonControlPage.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Button/ButtonControlPage.xaml.cs
@@ -1,3 +1,5 @@
+using Microsoft.Maui.Controls.Internals;
+
 namespace Maui.Controls.Sample;
 
 public class ButtonControlPage : NavigationPage
@@ -52,4 +54,17 @@ public void OnButtonReleased(object sender, EventArgs e)
 			ReleasedEventLabel.Text = "Released Event Executed";
 		}
 	}
+	
+	void MainLabel_Tapped(object sender, TappedEventArgs e)
+	{
+		// Recreate the page to verify initial mappers
+		ToolbarItems.Clear();
+		Content = new ContentView();
+		INameScope scope = this;
+		scope.UnregisterName("ClickedEventLabel");
+		scope.UnregisterName("ReleasedEventLabel");
+		scope.UnregisterName("PressedEventLabel");
+		scope.UnregisterName("ButtonShadow");
+		InitializeComponent();
+	}
 }
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryControlPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryControlPage.xaml
index d4d883d65840..d8a9b442573b 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryControlPage.xaml
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryControlPage.xaml
@@ -6,10 +6,14 @@
        <VerticalStackLayout Padding="20"
                             Spacing="8">
               <Label Text="Entry Control"
+                     AutomationId="MainLabel"
                      FontSize="20"
                      Margin="0,0,0,50"
-                     HorizontalOptions="Center"/>
-
+                     HorizontalOptions="Center">
+                <Label.GestureRecognizers>
+                  <TapGestureRecognizer Tapped="MainLabel_Tapped"/>
+                </Label.GestureRecognizers>
+              </Label>
               <local:UITestEntry x:Name="EntryControl"
                                  IsCursorVisible="False"
                                  Text="{Binding Text}"
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryControlPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryControlPage.xaml.cs
index 2b1c2eeb4be7..828b11d2c612 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryControlPage.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryControlPage.xaml.cs
@@ -1,5 +1,6 @@
 using System.ComponentModel;
 using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Internals;
 
 namespace Maui.Controls.Sample;
 
@@ -122,4 +123,20 @@ private void EntryControl_Unfocused(object sender, FocusEventArgs e)
 			vm.UnfocusedText = eventInfo;
 		}
 	}
+
+	void MainLabel_Tapped(object sender, TappedEventArgs e)
+	{
+		// Recreate the page to verify initial mappers
+		ToolbarItems.Clear();
+		Content = new ContentView();
+		INameScope scope = this;
+		scope.UnregisterName("EntryControl");
+		scope.UnregisterName("TextChangedLabel");
+		scope.UnregisterName("SelectionLengthEntry");
+		scope.UnregisterName("CursorPositionEntry");
+		scope.UnregisterName("CompletedLabel");
+		scope.UnregisterName("FocusedLabel");
+		scope.UnregisterName("UnfocusedLabel");
+		InitializeComponent();
+	}
 }
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryOptionsPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryOptionsPage.xaml
index d2e5c2838de4..e2c93ff09f92 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryOptionsPage.xaml
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryOptionsPage.xaml
@@ -45,6 +45,7 @@
                                     Clicked="HorizontalAlignmentButton_Clicked"/>
                             <Button Text="End"
                                     AutomationId="HEnd"
+                                    FontSize="10"
                                     Clicked="HorizontalAlignmentButton_Clicked"/>
                      </HorizontalStackLayout>
                      <!-- Vertical Alignment -->
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Label/LabelControlPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Label/LabelControlPage.xaml
index 985bcfa1fa21..91e3f0910293 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Label/LabelControlPage.xaml
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Label/LabelControlPage.xaml
@@ -30,6 +30,10 @@
         TextType="{Binding TextType}"
         VerticalTextAlignment="{Binding VerticalTextAlignment}"
         BackgroundColor="LightGray"
-        AutomationId="MainLabel"/>
+        AutomationId="MainLabel">
+        <Label.GestureRecognizers>
+          <TapGestureRecognizer Tapped="MainLabel_Tapped"/>
+        </Label.GestureRecognizers>
+      </Label>
     </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Label/LabelControlPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Label/LabelControlPage.xaml.cs
index b55530683fd3..d9dd8c3119be 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Label/LabelControlPage.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Label/LabelControlPage.xaml.cs
@@ -30,4 +30,12 @@ private async void NavigateToOptionsPage_Clicked(object sender, EventArgs e)
 		BindingContext = _viewModel = new LabelViewModel();
 		await Navigation.PushAsync(new LabelOptionsPage(_viewModel));
 	}
+
+	void MainLabel_Tapped(object sender, TappedEventArgs e)
+	{
+		// Recreate the page to verify initial mappers
+		ToolbarItems.Clear();
+		Content = new ContentView();
+		InitializeComponent();
+	}
 }
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ButtonFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ButtonFeatureTests.cs
index 0ee89c868864..42166d8526b6 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ButtonFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ButtonFeatureTests.cs
@@ -8,6 +8,7 @@ namespace Microsoft.Maui.TestCases.Tests;
 
 public class ButtonFeatureTests : UITest
 {
+	const string MainLabel = "ClickedEventLabel";
 	public const string ButtonFeatureMatrix = "Button Feature Matrix";
 	public ButtonFeatureTests(TestDevice testDevice) : base(testDevice)
 	{
@@ -38,6 +39,8 @@ public void Button_SetBorderColorAndTextColor_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test]
@@ -58,6 +61,8 @@ public void Button_SetBorderWidthEntryAndLineBreakMode_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 #if TEST_FAILS_ON_IOS && TEST_FAILS_ON_CATALYST //CharacterSpacingEntry property not working on iOS and Catalyst, Issue: https://github.com/dotnet/maui/issues/21488
@@ -76,6 +81,8 @@ public void Button_SetCharacterSpacingAndText_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 #endif
 
@@ -116,6 +123,8 @@ public void Button_SetCornerRadiusAndBorderWidth_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test]
@@ -145,6 +154,8 @@ public void Button_setFontAttributesAndFontFamily_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test]
@@ -161,6 +172,8 @@ public void Button_setFontAttributesAndText_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test]
@@ -179,6 +192,8 @@ public void Button_setFontAttributesAndTextTransform_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test]
@@ -195,6 +210,8 @@ public void Button_setFontFamilyAndText_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test]
@@ -213,6 +230,8 @@ public void Button_setFontFamilyAndTextTransform_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test]
@@ -233,6 +252,8 @@ public void Button_setFontSizeAndLineBreakMode_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test]
@@ -250,6 +271,8 @@ public void Button_setFontSizeAndText_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test]
@@ -269,6 +292,8 @@ public void Button_setFontSizeAndTextTransform_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test]
@@ -315,6 +340,8 @@ public void Button_SetLineBreakModeCharacterWrap_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test]
@@ -332,6 +359,8 @@ public void Button_SetLineBreakModeHeadTruncation_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test]
@@ -349,6 +378,8 @@ public void Button_SetLineBreakModeMiddleTruncation_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test]
@@ -366,6 +397,8 @@ public void Button_SetLineBreakModeTailTruncation_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test]
@@ -383,6 +416,8 @@ public void Button_SetLineBreakModeWordWrap_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test]
@@ -405,6 +440,8 @@ public void Button_setPaddingAndText_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test]
@@ -421,6 +458,8 @@ public void Button_setShadowAndText_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test]
@@ -437,6 +476,8 @@ public void Button_setTextAndTextColor_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test]
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/EntryFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/EntryFeatureTests.cs
index 2039a8561f67..6a9468513a03 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/EntryFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/EntryFeatureTests.cs
@@ -8,6 +8,7 @@ namespace Microsoft.Maui.TestCases.Tests;
 public class EntryFeatureTests : UITest
 {
 	public const string EntryFeatureMatrix = "Entry Feature Matrix";
+	public const string MainLabel = "MainLabel";
 
 #if IOS
 	private const int CropBottomValue = 1550;
@@ -35,6 +36,8 @@ public void VerifyInitialEventStates()
 	{
 		App.WaitForElement("TestEntry");
 		Assert.That(App.WaitForElement("UnfocusedLabel").GetText(), Is.EqualTo("Unfocused: Not triggered"));
+		App.Tap(MainLabel);
+		Assert.That(App.WaitForElement("UnfocusedLabel").GetText(), Is.EqualTo("Unfocused: Not triggered"));
 		Assert.That(App.WaitForElement("CompletedLabel").GetText(), Is.EqualTo("Completed: Not triggered"));
 		Assert.That(App.WaitForElement("TextChangedLabel").GetText(), Is.EqualTo("TextChanged: Old='', New='Test Entry'"));
 	}
@@ -44,6 +47,8 @@ public void VerifyEntryCompletedEvent()
 	{
 		App.WaitForElement("TestEntry");
 		App.Tap("TestEntry");
+		App.Tap(MainLabel);
+		App.Tap("TestEntry");
 		App.PressEnter();
 		App.DismissKeyboard();
 		Assert.That(App.WaitForElement("CompletedLabel").GetText(), Is.EqualTo("Completed: Event Triggered"));
@@ -55,6 +60,8 @@ public void VerifyEntryTextChangedEvent()
 
 		App.WaitForElement("TestEntry");
 		App.ClearText("TestEntry");
+		App.Tap(MainLabel);
+		App.ClearText("TestEntry");
 		App.EnterText("TestEntry", "New Text");
 
 #if !ANDROID
@@ -70,6 +77,9 @@ public void VerifyEntryFocusedEvent()
 	{
 		App.WaitForElement("TestEntry");
 		App.Tap("TestEntry");
+		App.Tap(MainLabel);
+		App.Tap("TestEntry");
+		
 #if ANDROID || IOS
 		if (App.WaitForKeyboardToShow())
 			App.DismissKeyboard();
@@ -82,6 +92,8 @@ public void VerifyEntryUnfocusedEvent()
 	{
 		App.WaitForElement("TestEntry");
 		App.WaitForElement("SelectionLengthEntry");
+		App.Tap(MainLabel);
+		App.WaitForElement("SelectionLengthEntry");
 		App.Tap("SelectionLengthEntry");
 		App.DismissKeyboard();
 		Assert.That(App.WaitForElement("UnfocusedLabel").GetText(), Is.EqualTo("Unfocused: Event Triggered"));
@@ -119,6 +131,9 @@ public void VerifyClearButtonVisiblityWhenTextAlignedHorizontally()
 		App.WaitForElement("TestEntry");
 		App.Tap("TestEntry");
 		VerifyScreenshotWithKeyboardHandling();
+		App.Tap(MainLabel);
+		App.Tap("TestEntry");
+		VerifyScreenshotWithKeyboardHandling();
 	}
 
 	[Test]
@@ -132,6 +147,8 @@ public void VerifyClearButtonVisiblityWhenTextAlignedVertically()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		App.Tap("TestEntry");
+		App.Tap(MainLabel);
+		App.Tap("TestEntry");
 		VerifyScreenshotWithKeyboardHandling();
 	}
 
@@ -147,6 +164,8 @@ public void VerifyClearButtonVisiblityWhenIsPasswordTrueOrFalse()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		App.Tap("TestEntry");
+		App.Tap(MainLabel);
+		App.Tap("TestEntry");
 		VerifyScreenshotWithKeyboardHandling();
 	}
 #endif
@@ -163,6 +182,8 @@ public void VerifyClearButtonVisibilityWhenIsReadOnlyTrue()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		App.Tap("TestEntry");
+		App.Tap(MainLabel);
+		App.Tap("TestEntry");
 		VerifyScreenshotWithKeyboardHandling();
 	}
 #endif
@@ -179,6 +200,10 @@ public void VerifyClearVisiblityButtonWhenTextColorChanged()
 		App.WaitForElement("TestEntry");
 		App.Tap("TestEntry");
 		VerifyScreenshotWithKeyboardHandling();
+		App.Tap(MainLabel);
+		App.WaitForElement("TestEntry");
+		App.Tap("TestEntry");
+		VerifyScreenshotWithKeyboardHandling();
 	}
 
 	[Test]
@@ -207,6 +232,8 @@ public void VerifyTextWhenAlingnedHorizontally()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
+		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
 	[Test]
@@ -219,6 +246,8 @@ public void VerifyTextWhenAlingnedVertically()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
+		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
 #if TEST_FAILS_ON_ANDROID //After setting IsReadOnly to true, the Cursor remains visible on Android even when IsCursorVisible is set to false, which is not the expected behavior.
@@ -233,6 +262,8 @@ public void VerifyTextEntryWhenSetAsReadOnly()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		// On Android, using App.EnterText in UI tests (e.g., with Appium UITest) can programmatically enter text into an Entry control even if its IsReadOnly property is set to true.
+		App.Tap(MainLabel);
+		// On Android, using App.EnterText in UI tests (e.g., with Appium UITest) can programmatically enter text into an Entry control even if its IsReadOnly property is set to true.
 		App.EnterText("TestEntry", "123");
 		Assert.That(App.WaitForElement("TestEntry").GetText(), Is.EqualTo("Test Entry"));
 	}
@@ -249,6 +280,8 @@ public void VerifyTextWhenFontFamilySetValue()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
+		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
 	[Test]
@@ -263,6 +296,8 @@ public void VerifyTextWhenCharacterSpacingSetValues()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
+		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
 	[Test]
@@ -279,6 +314,8 @@ public void VerifyHorizontalTextAlignmentBasedOnCharacterSpacing()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
+		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
 	[Test]
@@ -295,6 +332,8 @@ public void VerifyVerticalTextAlignmentBasedOnCharacterSpacing()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
+		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
 #if TEST_FAILS_ON_IOS // When taking a screenshot of a password field (<Entry IsPassword="true" />), iOS hides the password text for security reasons.
@@ -312,6 +351,8 @@ public void VerifyIsPasswordBasedOnCharacterSpacing()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
+		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 #endif
 
@@ -329,6 +370,8 @@ public void VerifyCharacterSpacingWhenFontFamily()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
+		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
 #if TEST_FAILS_ON_IOS // When taking a screenshot of a password field (<Entry IsPassword="true" />), iOS hides the password text for security reasons.
@@ -343,6 +386,8 @@ public void VerifyTextWhenIsPasswordTrueOrFalse()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
+		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
 	[Test]
@@ -356,6 +401,8 @@ public void VerifyIsPasswordBasedOnVerticalTextAlignment()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
+		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
 	[Test]
@@ -371,6 +418,8 @@ public void VerifyIsPasswordBasedOnHorizontalTextAlignment()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
+		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
 	[Test]
@@ -408,6 +457,8 @@ public void VerifyCharacterSpacingWhenMaxLengthSet()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
+		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
 	[Test]
@@ -425,6 +476,8 @@ public void VerifyTextWhenMaxLengthSetValue()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		Assert.That(App.WaitForElement("TestEntry").GetText(), Is.EqualTo("Test E"));
+		App.Tap(MainLabel);
+		Assert.That(App.WaitForElement("TestEntry").GetText(), Is.EqualTo("Test E"));
 	}
 
 #if TEST_FAILS_ON_ANDROID //After setting IsReadOnly to true, the Cursor remains visible on Android even when IsCursorVisible is set to false, which is not the expected behavior.
@@ -445,6 +498,8 @@ public void VerifyMaxLengthWhenIsReadOnlyTrue()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		// On Android, using App.EnterText in UI tests (e.g., with Appium UITest) can programmatically enter text into an Entry control even if its IsReadOnly property is set to true.
+		App.Tap(MainLabel);
+		// On Android, using App.EnterText in UI tests (e.g., with Appium UITest) can programmatically enter text into an Entry control even if its IsReadOnly property is set to true.
 		App.EnterText("TestEntry", "123");
 		Assert.That(App.WaitForElement("TestEntry").GetText(), Is.EqualTo("Test E"));
 
@@ -464,6 +519,8 @@ public void VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
+		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
 	[Test]
@@ -477,6 +534,8 @@ public void VerifyTextWhenTextColorSetCorrectly()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
+		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
 	[Test]
@@ -491,6 +550,8 @@ public void VerifyTextWhenFontSizeSetCorrectly()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
+		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
 #if TEST_FAILS_ON_IOS // When taking a screenshot of a password field (<Entry IsPassword="true" />), iOS hides the password text for security reasons.
@@ -506,6 +567,8 @@ public void VerifyIsPasswordWhenFontSizeSet()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
+		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 #endif
 
@@ -521,6 +584,8 @@ public void VerifyTextWhenIsTextPredictionEnabledTrueOrFalse()
 			App.Tap("Apply");
 			App.WaitForElement("TestEntry");
 			App.ClearText("TestEntry");
+			App.Tap(MainLabel);
+			App.ClearText("TestEntry");
 			App.EnterText("TestEntry", "Testig");
 			App.EnterText("TestEntry", " ");
 			Assert.That(App.WaitForElement("TestEntry").GetText(), Is.EqualTo("Testing "));
@@ -537,6 +602,8 @@ public void VerifyTextWhenIsSpellCheckEnabledTrueOrFalse()
 			App.Tap("Apply");
 			App.WaitForElement("TestEntry");
 			App.ClearText("TestEntry");
+			App.Tap(MainLabel);
+			App.ClearText("TestEntry");
 			App.EnterText("TestEntry", "Testig");
 			App.EnterText("TestEntry", " ");
 			VerifyScreenshotWithKeyboardHandling();
@@ -558,6 +625,8 @@ public void VerifyTextWhenSelectionLengthSetValue()
 		App.Tap("UpdateCursorAndSelectionButton");
 		App.WaitForElement("TestEntry");
 		App.Tap("TestEntry");
+		App.Tap(MainLabel);
+		App.Tap("TestEntry");
 		App.DismissKeyboard();
 		Assert.That(App.WaitForElement("SelectionLengthEntry").GetText(), Is.EqualTo("0"));
 	}
@@ -577,6 +646,8 @@ public void VerifyTextWhenCursorPositionValueSet()
 		App.Tap("UpdateCursorAndSelectionButton");
 		App.WaitForElement("TestEntry");
 		App.Tap("TestEntry");
+		App.Tap(MainLabel);
+		App.Tap("TestEntry");
 		App.DismissKeyboard();
 		Assert.That(App.WaitForElement("CursorPositionEntry").GetText(), Is.EqualTo("10"));
 	}
@@ -599,6 +670,8 @@ public void VerifyIsPasswordWhenCursorPositionValueSet()
 		App.Tap("UpdateCursorAndSelectionButton");
 		App.WaitForElement("TestEntry");
 		App.Tap("TestEntry");
+		App.Tap(MainLabel);
+		App.Tap("TestEntry");
 		App.DismissKeyboard();
 		Assert.That(App.WaitForElement("CursorPositionEntry").GetText(), Is.EqualTo("10"));
 	}
@@ -640,6 +713,8 @@ public void VerifyCursorPositionWhenIsReadOnlyTrue()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		App.Tap("TestEntry");
+		App.Tap(MainLabel);
+		App.Tap("TestEntry");
 		Assert.That(App.WaitForElement("CursorPositionEntry").GetText(), Is.EqualTo("0"));
 	}
 
@@ -659,6 +734,8 @@ public void VerifySelectionLenghtWhenIsReadOnlyTrue()
 		App.Tap("UpdateCursorAndSelectionButton");
 		App.WaitForElement("TestEntry");
 		App.Tap("TestEntry");
+		App.Tap(MainLabel);
+		App.Tap("TestEntry");
 		Assert.That(App.WaitForElement("SelectionLengthEntry").GetText(), Is.EqualTo("3"));
 	}
 #endif
@@ -672,6 +749,8 @@ public void VerifyTextWhenReturmCommandAndReturnCommandParameter()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		App.ClearText("TestEntry");
+		App.Tap(MainLabel);
+		App.ClearText("TestEntry");
 		App.EnterText("TestEntry", "Test");
 		App.Tap("TestEntry");
 		App.PressEnter();
@@ -722,6 +801,8 @@ public void VerifyEntryControlWhenIsEnabledTrueOrFalse()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		App.ClearText("TestEntry");
+		App.Tap(MainLabel);
+		App.ClearText("TestEntry");
 		App.EnterText("TestEntry", "123");
 		Assert.That(App.WaitForElement("TestEntry").GetText(), Is.EqualTo("123"));
 		App.WaitForElement("Options");
@@ -732,6 +813,8 @@ public void VerifyEntryControlWhenIsEnabledTrueOrFalse()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		App.EnterText("TestEntry", "123");
+		App.Tap(MainLabel);
+		App.EnterText("TestEntry", "123");
 		Assert.That(App.WaitForElement("TestEntry").GetText(), Is.EqualTo("Test Entry"));
 
 	}
@@ -746,6 +829,8 @@ public void VerifyEntryControlWhenIsVisibleTrueOrFalse()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		App.WaitForElement("Options");
+		App.Tap(MainLabel);
+		App.WaitForElement("Options");
 		App.Tap("Options");
 		App.WaitForElement("VisibleFalse");
 		App.Tap("VisibleFalse");
@@ -765,6 +850,8 @@ public void VerifyEntryControlWhenFlowDirectionSet()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
+		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
 	[Test]
@@ -780,6 +867,8 @@ public void VerifyPlaceholderWhenFlowDirectionSet()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
+		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
 
@@ -795,6 +884,10 @@ public void VerifyEntryControlWhenPlaceholderTextSet()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		App.ClearText("TestEntry");
+		App.Tap(MainLabel);
+		App.ClearText("TestEntry");
+		App.Tap(MainLabel);
+		App.ClearText("TestEntry");
 		App.DismissKeyboard();
 		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
@@ -838,6 +931,8 @@ public void VerifyTextWhenFontAttributesSet()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
+		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
 	[Test]
@@ -851,6 +946,8 @@ public void VerifyTextWhenTextTransFormSet()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		Assert.That(App.WaitForElement("TestEntry").GetText(), Is.EqualTo("TEST ENTRY"));
+		App.Tap(MainLabel);
+		Assert.That(App.WaitForElement("TestEntry").GetText(), Is.EqualTo("TEST ENTRY"));
 	}
 
 #if TEST_FAILS_ON_WINDOWS //related issue link: https://github.com/dotnet/maui/issues/29812
@@ -882,6 +979,8 @@ public void VerifyPlaceholderWithShadow()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
+		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 #endif
 
@@ -930,6 +1029,8 @@ public void VerifyPlaceholderWithHorizontalAlignment()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
+		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
 	[Test]
@@ -945,6 +1046,8 @@ public void VerifyPlaceholderWithVerticalAlignment()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
+		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
 #if TEST_FAILS_ON_WINDOWS //related issue link: https://github.com/dotnet/maui/issues/30071
@@ -962,6 +1065,8 @@ public void VerifyPlaceholderWithCharacterSpacing()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
+		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 #endif
 
@@ -978,6 +1083,8 @@ public void VerifyPlaceholderWithFontFamily()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
+		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
 	[Test]
@@ -994,6 +1101,8 @@ public void VerifyPlaceholderWithFontSize()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
+		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
 	[Test]
@@ -1009,6 +1118,8 @@ public void VerifyPlaceholderWithFontAttributes()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
+		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
 	/// <summary>
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/LabelFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/LabelFeatureTests.cs
index c13334d186a3..963409e66a1c 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/LabelFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/LabelFeatureTests.cs
@@ -71,6 +71,8 @@ public void VerifyLabelWithFormattedText()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(2)]
@@ -87,6 +89,8 @@ public void VerifyLabelWhenFormattedTextWithHorizontalAndVerticalAlignmentStart(
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(3)]
@@ -103,6 +107,8 @@ public void VerifyLabelWithFormattedTextWhenHorizontalAndVerticalAlignmentCenter
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(4)]
@@ -119,6 +125,8 @@ public void VerifyLabelWithFormattedTextWhenHorizontalAndVerticalAlignmentEnd()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(5)]
@@ -135,6 +143,8 @@ public void VerifyLabelWithFormattedTextAndTextTransformLower()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(6)]
@@ -151,6 +161,8 @@ public void VerifyLabelWithFormattedTextWhenTextTransformUpper()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(7)]
@@ -167,6 +179,8 @@ public void VerifyLabelWithFormattedTextWhenTextColor()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(8)]
@@ -188,6 +202,8 @@ public void VerifyLabelWhenFormattedTextWithPadding()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 
@@ -206,6 +222,8 @@ public void VerifyLabelWithFormattedTextWhenMaxLines()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 #if TEST_FAILS_ON_CATALYST && TEST_FAILS_ON_IOS && TEST_FAILS_ON_ANDROID // Issue Link: https://github.com/dotnet/maui/issues/27828
@@ -224,6 +242,8 @@ public void VerifyLabelWithFormattedTextAndLineHeight()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(11)]
@@ -240,6 +260,8 @@ public void VerifyLabelWithFormattedTextWhenTextDecorationsUnderLine()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(12)]
@@ -256,6 +278,8 @@ public void VerifyLabelWithFormattedTextWhenTextDecorationsStrikethrough()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 #if TEST_FAILS_ON_WINDOWS // Issue Link: https://github.com/dotnet/maui/issues/27828
@@ -274,6 +298,8 @@ public void VerifyLabelWithFormattedTextAndCharacterSpacing()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(14)]
@@ -290,6 +316,8 @@ public void VerifyLabelWithFormattedTextWhenFontAttributesBold()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(15)]
@@ -306,6 +334,8 @@ public void VerifyLabelWithFormattedTextWhenFontAttributesItalic()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(16)]
@@ -322,6 +352,8 @@ public void VerifyLabelWithFormattedTextWhenFontFamilyDokdo()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(17)]
@@ -338,6 +370,8 @@ public void VerifyLabelWithFormattedTextWhenFontFamilyMonserratBold()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 #endif
 #endif
@@ -358,6 +392,8 @@ public void VerifyLabelWithFormattedTextWhenFontSize()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 #endif
 
@@ -376,6 +412,8 @@ public void VerifyLabelWithFormattedTextAndLineBreakModeCharacterWrap()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(42)]
@@ -392,6 +430,8 @@ public void VerifyLabelWithTextAndLineBreakModeCharacterWrap()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 #endif
@@ -411,6 +451,8 @@ public void VerifyLabelWithFormattedTextWhenLineBreakModeTailTruncation()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(41)]
@@ -427,6 +469,8 @@ public void VerifyLabelWithTextAndLineBreakModeTailTruncation()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 #endif
 
@@ -444,6 +488,8 @@ public void VerifyLabelWithFormattedTextWhenLineBreakModeWordWrap()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(22)]
@@ -460,6 +506,8 @@ public void VerifyLabelWithFormattedTextAndLineBreakModeNoWrap()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 #if TEST_FAILS_ON_WINDOWS // Issue Link: https://github.com/dotnet/maui/issues/21294
@@ -477,6 +525,8 @@ public void VerifyLabelWithFormattedTextWhenLineBreakModeHeadTruncation()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(24)]
@@ -493,6 +543,8 @@ public void VerifyLabelWithFormattedTextWhenLineBreakModeMiddleTruncation()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 #endif
 
@@ -525,6 +577,8 @@ public void VerifyLabelWithTextAndFontSize()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(27)]
@@ -541,6 +595,8 @@ public void VerifyLabelWithTextAndFontColor()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(28)]
@@ -557,6 +613,8 @@ public void VerifyLabelWithTextAndTextTransform()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(29)]
@@ -574,6 +632,8 @@ public void VerifyLabelWithTextAndCharacterSpacing()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(30)]
@@ -590,6 +650,8 @@ public void VerifyLabelWithTextAndTextDecorations()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(31)]
@@ -606,6 +668,8 @@ public void VerifyLabelWithTextAndFontFamily()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(32)]
@@ -622,6 +686,8 @@ public void VerifyLabelWithTextAndFontAttributes()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(33)]
@@ -640,6 +706,8 @@ public void VerifyLabelWithTextWhenVerticalAndHorizontalAlignmentStart()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(34)]
@@ -658,6 +726,8 @@ public void VerifyLabelWithTextWhenVerticalAndHorizontalAlignmentCenter()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(35)]
@@ -676,6 +746,8 @@ public void VerifyLabelWithTextWhenVerticalAndHorizontalAlignmentEnd()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(36)]
@@ -697,6 +769,8 @@ public void VerifyLabelWithTextWhenPaddingApplied()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(37)]
@@ -714,6 +788,8 @@ public void VerifyLabelWithTextAndMaxlines()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(59)]
@@ -731,6 +807,8 @@ public void VerifyLabelWithTextWhenLineHeight()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(38)]
@@ -747,6 +825,8 @@ public void VerifyLabelWithTextAndLineBreakModeNoWrap()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 #if TEST_FAILS_ON_WINDOWS // Issue Link: https://github.com/dotnet/maui/issues/21294
@@ -764,6 +844,8 @@ public void VerifyLabelWithTextAndLineBreakModeHeadTruncation()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(40)]
@@ -780,6 +862,8 @@ public void VerifyLabelWithTextAndLineBreakModeMiddleTruncation()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 #endif
 
@@ -799,6 +883,8 @@ public void VerifyLabelWithFontAttributesAndFontFamily()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(46)]
@@ -818,6 +904,8 @@ public void VerifyLabelWithFontAttributesAndFontSize()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(47)]
@@ -836,6 +924,8 @@ public void VerifyLabelWithFontAttributesAndTextColor()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(48)]
@@ -854,6 +944,8 @@ public void VerifyLabelWithFontAttributesAndTextTransform()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(49)]
@@ -872,6 +964,8 @@ public void VerifyLabelWithFontAttributesAndTextDecorations()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 #if TEST_FAILS_ON_CATALYST && TEST_FAILS_ON_IOS // Issue Link: https://github.com/dotnet/maui/issues/20372,  https://github.com/dotnet/maui/issues/29672, https://github.com/dotnet/maui/issues/29668 
@@ -889,6 +983,8 @@ public void VerifyLabelWithTextAndTextType()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(50)]
@@ -907,6 +1003,8 @@ public void VerifyLabelWithFontAttributesAndTextType()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(56)]
@@ -925,6 +1023,8 @@ public void VerifyLabelWithTextTypeAndTextColor()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(57)]
@@ -944,6 +1044,8 @@ public void VerifyLabelWithTextTypeAndFontSize()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(58)]
@@ -962,6 +1064,8 @@ public void VerifyLabelWithTextTypeAndLineBreakModeNoWrap()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(43)]
@@ -980,6 +1084,8 @@ public void VerifyLabelWithTextTypeAndLineBreakModeWordWrap()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(60)]
@@ -998,6 +1104,8 @@ public void VerifyLabelWithFontFamilyAndTextType()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 #if TEST_FAILS_ON_ANDROID// Issue Link:  https://github.com/dotnet/maui/issues/29672, https://github.com/dotnet/maui/issues/29668, https://github.com/dotnet/maui/issues/22594
@@ -1018,6 +1126,8 @@ public void VerifyLabelWithTextTypeAndLineHeight()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(68)]
@@ -1037,6 +1147,8 @@ public void VerifyLabelWithTextTypeAndCharacterSpacing()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 #if TEST_FAILS_ON_WINDOWS // Issue Link: https://github.com/dotnet/maui/issues/21294
@@ -1056,6 +1168,8 @@ public void VerifyLabelWithTextTypeAndLineBreakModeCharacterWrap()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 #endif
 #endif
@@ -1077,6 +1191,8 @@ public void VerifyLabelWithFontFamilyAndFontColor()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(52)]
@@ -1096,6 +1212,8 @@ public void VerifyLabelWithFontFamilyAndFontSize()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(53)]
@@ -1114,6 +1232,8 @@ public void VerifyLabelWithFontFamilyAndTextDecorations()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(54)]
@@ -1132,6 +1252,8 @@ public void VerifyLabelWithFontFamilyAndTextTransform()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(55)]
@@ -1150,6 +1272,8 @@ public void VerifyLabelWithTextDecorationsAndTextTransform()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 #if TEST_FAILS_ON_ANDROID && TEST_FAILS_ON_CATALYST && TEST_FAILS_ON_IOS // Issue Link: https://github.com/dotnet/maui/issues/24298 , https://github.com/dotnet/maui/issues/29673, https://github.com/dotnet/maui/issues/29674
@@ -1169,6 +1293,8 @@ public void VerifyLabelWithTextTypeAndLineBreakModeTailTruncation()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(62)]
@@ -1187,6 +1313,8 @@ public void VerifyLabelWithTextTypeAndTextDecorations()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 #if TEST_FAILS_ON_WINDOWS // Issue Link: https://github.com/dotnet/maui/issues/21294
@@ -1206,6 +1334,8 @@ public void VerifyLabelWithTextTypeAndLineBreakModeHeadTruncation()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(64)]
@@ -1224,6 +1354,8 @@ public void VerifyLabelWithTextTypeAndLineBreakModeMiddleTruncation()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 
 	[Test, Order(65)]
@@ -1242,6 +1374,8 @@ public void VerifyLabelWithTextTypeAndTextTransform()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot();
+		App.Tap(MainLabel);
+		VerifyScreenshot();
 	}
 #endif
 #endif
diff --git a/src/Core/src/Handlers/Button/ButtonHandler.cs b/src/Core/src/Handlers/Button/ButtonHandler.cs
index 89e0ce92b1bc..76e5fe4c51fd 100644
--- a/src/Core/src/Handlers/Button/ButtonHandler.cs
+++ b/src/Core/src/Handlers/Button/ButtonHandler.cs
@@ -27,10 +27,10 @@ public partial class ButtonHandler : IButtonHandler
 
 		public static IPropertyMapper<ITextButton, IButtonHandler> TextButtonMapper = new PropertyMapper<ITextButton, IButtonHandler>()
 		{
+			[nameof(IText.Text)] = MapText,
 			[nameof(ITextStyle.CharacterSpacing)] = MapCharacterSpacing,
 			[nameof(ITextStyle.Font)] = MapFont,
 			[nameof(ITextStyle.TextColor)] = MapTextColor,
-			[nameof(IText.Text)] = MapText
 		};
 
 		public static IPropertyMapper<IButton, IButtonHandler> Mapper = new PropertyMapper<IButton, IButtonHandler>(TextButtonMapper, ImageButtonMapper, ViewHandler.ViewMapper)
diff --git a/src/Core/src/Handlers/Button/ButtonHandler.iOS.cs b/src/Core/src/Handlers/Button/ButtonHandler.iOS.cs
index 138ca588c892..e9f873ab0f2a 100644
--- a/src/Core/src/Handlers/Button/ButtonHandler.iOS.cs
+++ b/src/Core/src/Handlers/Button/ButtonHandler.iOS.cs
@@ -98,8 +98,11 @@ public static void MapText(IButtonHandler handler, IText button)
 		{
 			handler.PlatformView?.UpdateText(button);
 
-			// Any text update requires that we update any attributed string formatting
-			MapFormatting(handler, button);
+			if (!handler.IsConnectingHandler())
+			{
+				// Any text update requires that we update any attributed string formatting
+				MapFormatting(handler, button);
+			}
 		}
 
 		public static void MapTextColor(IButtonHandler handler, ITextStyle button)
diff --git a/src/Core/src/Handlers/Entry/EntryHandler.cs b/src/Core/src/Handlers/Entry/EntryHandler.cs
index 3d4d666adffc..af96ad4dc1bf 100644
--- a/src/Core/src/Handlers/Entry/EntryHandler.cs
+++ b/src/Core/src/Handlers/Entry/EntryHandler.cs
@@ -17,25 +17,31 @@ namespace Microsoft.Maui.Handlers
 {
 	public partial class EntryHandler : IEntryHandler
 	{
-		public static IPropertyMapper<IEntry, IEntryHandler> Mapper = new PropertyMapper<IEntry, IEntryHandler>(ViewHandler.ViewMapper)
+		private static readonly IPropertyMapper<IEntry, IEntryHandler> TextMapper = new PropertyMapper<IEntry, IEntryHandler>
 		{
-			[nameof(IEntry.Background)] = MapBackground,
-			[nameof(IEntry.CharacterSpacing)] = MapCharacterSpacing,
 			[nameof(IEntry.ClearButtonVisibility)] = MapClearButtonVisibility,
-			[nameof(IEntry.Font)] = MapFont,
-			[nameof(IEntry.IsPassword)] = MapIsPassword,
 			[nameof(IEntry.HorizontalTextAlignment)] = MapHorizontalTextAlignment,
 			[nameof(IEntry.VerticalTextAlignment)] = MapVerticalTextAlignment,
+			// Ensure Text is mapped before LineHeight/Decorations/CharacterSpacing/HorizontalTextAlignment/TextColor/Font
+			// due to them being applied to the native object (i.e. AttributedText on iOS) created by mapping Text
+			[nameof(IEntry.Text)] = MapText,
+			[nameof(IEntry.MaxLength)] = MapMaxLength,
+			[nameof(IEntry.Font)] = MapFont,
+			[nameof(IEntry.CharacterSpacing)] = MapCharacterSpacing,
+			[nameof(IEntry.TextColor)] = MapTextColor
+		};
+
+		public static IPropertyMapper<IEntry, IEntryHandler> Mapper = new PropertyMapper<IEntry, IEntryHandler>(TextMapper, ViewHandler.ViewMapper)
+		{
+			[nameof(IEntry.Background)] = MapBackground,
+			[nameof(IEntry.IsPassword)] = MapIsPassword,
 			[nameof(IEntry.IsReadOnly)] = MapIsReadOnly,
 			[nameof(IEntry.IsTextPredictionEnabled)] = MapIsTextPredictionEnabled,
 			[nameof(IEntry.IsSpellCheckEnabled)] = MapIsSpellCheckEnabled,
 			[nameof(IEntry.Keyboard)] = MapKeyboard,
-			[nameof(IEntry.MaxLength)] = MapMaxLength,
 			[nameof(IEntry.Placeholder)] = MapPlaceholder,
 			[nameof(IEntry.PlaceholderColor)] = MapPlaceholderColor,
 			[nameof(IEntry.ReturnType)] = MapReturnType,
-			[nameof(IEntry.Text)] = MapText,
-			[nameof(IEntry.TextColor)] = MapTextColor,
 			[nameof(IEntry.CursorPosition)] = MapCursorPosition,
 			[nameof(IEntry.SelectionLength)] = MapSelectionLength
 		};
diff --git a/src/Core/src/Handlers/Entry/EntryHandler.iOS.cs b/src/Core/src/Handlers/Entry/EntryHandler.iOS.cs
index 20c31183773a..33836b144a9e 100644
--- a/src/Core/src/Handlers/Entry/EntryHandler.iOS.cs
+++ b/src/Core/src/Handlers/Entry/EntryHandler.iOS.cs
@@ -39,8 +39,13 @@ public static void MapText(IEntryHandler handler, IEntry entry)
 		{
 			handler.PlatformView?.UpdateText(entry);
 
-			// Any text update requires that we update any attributed string formatting
-			MapFormatting(handler, entry);
+			if (!handler.IsConnectingHandler())
+			{
+				// If we're not connecting the handler, we need to update the text formatting
+				// This is because the text may have changed, and we need to ensure that
+				// any attributed string formatting is applied correctly.
+				MapFormatting(handler, entry);
+			}
 		}
 
 		public static void MapTextColor(IEntryHandler handler, IEntry entry) =>
@@ -96,14 +101,14 @@ public static void MapClearButtonVisibility(IEntryHandler handler, IEntry entry)
 
 		public static void MapFormatting(IEntryHandler handler, IEntry entry)
 		{
-			handler.PlatformView?.UpdateMaxLength(entry);
+			handler.UpdateValue(nameof(IEntry.MaxLength));
 
 			// Update all of the attributed text formatting properties
-			handler.PlatformView?.UpdateCharacterSpacing(entry);
+			handler.UpdateValue(nameof(IEntry.CharacterSpacing));
 
 			// Setting any of those may have removed text alignment settings,
 			// so we need to make sure those are applied, too
-			handler.PlatformView?.UpdateHorizontalTextAlignment(entry);
+			handler.UpdateValue(nameof(IEntry.HorizontalTextAlignment));
 		}
 
 		protected virtual bool OnShouldReturn(UITextField view) =>
diff --git a/src/Core/src/Handlers/Label/LabelHandler.cs b/src/Core/src/Handlers/Label/LabelHandler.cs
index 4f56985c4e03..08788a6b9dfe 100644
--- a/src/Core/src/Handlers/Label/LabelHandler.cs
+++ b/src/Core/src/Handlers/Label/LabelHandler.cs
@@ -15,8 +15,23 @@ namespace Microsoft.Maui.Handlers
 {
 	public partial class LabelHandler : ILabelHandler
 	{
-		public static IPropertyMapper<ILabel, ILabelHandler> Mapper = new PropertyMapper<ILabel, ILabelHandler>(ViewHandler.ViewMapper)
+		private static readonly IPropertyMapper<ILabel, ILabelHandler> TextMapper = new PropertyMapper<ILabel, ILabelHandler>
 		{
+			// Ensure Text is mapped before LineHeight/Decorations/CharacterSpacing/HorizontalTextAlignment/TextColor/Font
+			// due to them being applied to the native object (i.e. AttributedText on iOS) created by mapping Text
+			[nameof(ILabel.Text)] = MapText,
+			[nameof(ITextStyle.Font)] = MapFont,
+			[nameof(ILabel.LineHeight)] = MapLineHeight,
+			[nameof(ILabel.TextDecorations)] = MapTextDecorations,
+			[nameof(ITextStyle.CharacterSpacing)] = MapCharacterSpacing,
+			[nameof(ITextAlignment.HorizontalTextAlignment)] = MapHorizontalTextAlignment,
+			[nameof(ITextAlignment.VerticalTextAlignment)] = MapVerticalTextAlignment,
+			[nameof(ITextStyle.TextColor)] = MapTextColor,
+		};
+		
+		public static IPropertyMapper<ILabel, ILabelHandler> Mapper = new PropertyMapper<ILabel, ILabelHandler>(TextMapper, ViewHandler.ViewMapper)
+		{
+			[nameof(ILabel.Padding)] = MapPadding,
 #if IOS || TIZEN
 			[nameof(ILabel.Background)] = MapBackground,
 			[nameof(ILabel.Opacity)] = MapOpacity,
@@ -28,15 +43,6 @@ public partial class LabelHandler : ILabelHandler
 #if TIZEN
 			[nameof(ILabel.Shadow)] = MapShadow,
 #endif
-			[nameof(ITextStyle.CharacterSpacing)] = MapCharacterSpacing,
-			[nameof(ITextStyle.Font)] = MapFont,
-			[nameof(ITextAlignment.HorizontalTextAlignment)] = MapHorizontalTextAlignment,
-			[nameof(ITextAlignment.VerticalTextAlignment)] = MapVerticalTextAlignment,
-			[nameof(ILabel.LineHeight)] = MapLineHeight,
-			[nameof(ILabel.Padding)] = MapPadding,
-			[nameof(ILabel.Text)] = MapText,
-			[nameof(ITextStyle.TextColor)] = MapTextColor,
-			[nameof(ILabel.TextDecorations)] = MapTextDecorations,
 #if ANDROID
 			[nameof(ILabel.Background)] = MapBackground,
 #endif
diff --git a/src/Core/src/Handlers/Label/LabelHandler.iOS.cs b/src/Core/src/Handlers/Label/LabelHandler.iOS.cs
index 4ce9126859c2..6a4608df1fcd 100644
--- a/src/Core/src/Handlers/Label/LabelHandler.iOS.cs
+++ b/src/Core/src/Handlers/Label/LabelHandler.iOS.cs
@@ -24,8 +24,11 @@ public static void MapText(ILabelHandler handler, ILabel label)
 		{
 			handler.PlatformView?.UpdateTextPlainText(label);
 
-			// Any text update requires that we update any attributed string formatting
-			MapFormatting(handler, label);
+			if (!handler.IsConnectingHandler())
+			{
+				// Any text update requires that we update any attributed string formatting
+				MapFormatting(handler, label);
+			}
 		}
 
 		public static void MapTextColor(ILabelHandler handler, ILabel label)