diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyEntryHorizontalEndTextAlignmentPosition.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyEntryHorizontalEndTextAlignmentPosition.png
new file mode 100644
index 000000000000..78945d698676
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyEntryHorizontalEndTextAlignmentPosition.png differ
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue24405.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue24405.xaml
new file mode 100644
index 000000000000..8daff2dde71f
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue24405.xaml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.Issues"
+				 x:Class="Maui.Controls.Sample.Issues.Issue24405">
+  <VerticalStackLayout>
+    <Entry AutomationId="entry" x:Name="entry" Placeholder="Enter text here" HorizontalTextAlignment="End"/>
+    <Button AutomationId="button" Text="Click" Clicked="OnButtonClicked"/>
+  </VerticalStackLayout>
+</ContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue24405.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue24405.xaml.cs
new file mode 100644
index 000000000000..5e5599f65540
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue24405.xaml.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.CustomAttributes;
+using Microsoft.Maui.Controls.Internals;
+
+namespace Maui.Controls.Sample.Issues
+{
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	[Preserve(AllMembers = true)]
+	[Issue(IssueTracker.Github, 24405, "Entry with right aligned text keeps text jumping to the left during editing", PlatformAffected.UWP)]
+	public partial class Issue24405 : ContentPage
+	{
+		public Issue24405()
+		{
+			InitializeComponent();
+		}
+
+		private void OnButtonClicked(object sender, EventArgs e)
+		{
+			entry.Text = "Hello";
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24405.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24405.cs
new file mode 100644
index 000000000000..575f4b33a785
--- /dev/null
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24405.cs
@@ -0,0 +1,25 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues
+{
+	public class Issue24405 : _IssuesUITest
+	{
+		public Issue24405(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Entry with right aligned text keeps text jumping to the left during editing";
+
+		[Test]
+		[Category(UITestCategories.Entry)]
+		[FailsOnMac]
+		public void VerifyEntryHorizontalEndTextAlignmentPosition()
+		{
+			App.WaitForElement("button");
+			App.Tap("button");
+			VerifyScreenshot();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyEntryHorizontalEndTextAlignmentPosition.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyEntryHorizontalEndTextAlignmentPosition.png
new file mode 100644
index 000000000000..6440a6104982
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyEntryHorizontalEndTextAlignmentPosition.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyEntryHorizontalEndTextAlignmentPosition.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyEntryHorizontalEndTextAlignmentPosition.png
new file mode 100644
index 000000000000..686aab4023ae
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyEntryHorizontalEndTextAlignmentPosition.png differ
diff --git a/src/Core/src/Platform/Windows/MauiTextBox.cs b/src/Core/src/Platform/Windows/MauiTextBox.cs
index 2a60660fd2c2..b5d34dbf8700 100644
--- a/src/Core/src/Platform/Windows/MauiTextBox.cs
+++ b/src/Core/src/Platform/Windows/MauiTextBox.cs
@@ -67,16 +67,16 @@ static void OnIsDeleteButtonEnabledPropertyChanged(DependencyObject d, Dependenc
 
 			Button? deleteButton = element.GetDescendantByName<Button>(DeleteButtonElementName);
 
-			if (deleteButton is not null)
+			// Adjust the second column's width to 'Auto' when the delete button is enabled, and set it to zero when disabled.
+			if (deleteButton?.Parent is Grid rootGrid && rootGrid.ColumnDefinitions.Count > 1)
 			{
 				if (GetIsDeleteButtonEnabled(element))
 				{
-					deleteButton.RenderTransform = null;
+					rootGrid.ColumnDefinitions[1].Width = new UI.Xaml.GridLength(1, UI.Xaml.GridUnitType.Auto);
 				}
 				else
 				{
-					// This is a workaround to move the button to be effectively invisible. It is not perfect.
-					deleteButton.RenderTransform = new TranslateTransform() { X = -int.MaxValue, Y = -int.MaxValue };
+					rootGrid.ColumnDefinitions[1].Width = new UI.Xaml.GridLength(0);
 				}
 			}
 		}