diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test.png
index 70df9485b73e..ef82670688f7 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test_1.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test_1.png
new file mode 100644
index 000000000000..367d7a5d77a6
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test_1.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test_2.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test_2.png
new file mode 100644
index 000000000000..33ec388004e6
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test_2.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test_3.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test_3.png
new file mode 100644
index 000000000000..b1a15abb48fc
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test_3.png differ
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue24414.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue24414.xaml
index 28c4e85a0270..37ecf63ef0bd 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue24414.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue24414.xaml
@@ -5,7 +5,7 @@
              Title="Issue24414">
 
     <Grid RowDefinitions="Auto,*,*,*,*" ColumnDefinitions="*,*,*,*" RowSpacing="6" ColumnSpacing="6" Padding="16">
-      <Label x:Name="TheLabel" AutomationId="WaitForStubControl" Grid.ColumnSpan="4">
+      <Label x:Name="TheLabel" AutomationId="TheLabel" Grid.ColumnSpan="4">
         <Label.GestureRecognizers>
           <TapGestureRecognizer Tapped="OnTapGestureRecognizerTapped"/>
         </Label.GestureRecognizers>
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue24414.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue24414.xaml.cs
index e20af0607ae2..1f0783cab619 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue24414.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue24414.xaml.cs
@@ -6,8 +6,8 @@ namespace Maui.Controls.Sample.Issues;
 
 public partial class Issue24414 : ContentPage
 {
-	int fn = 0;
-	string[] labels = ["LLOHE WODRL", "OLLEH ORLWD", "LOHEL LODRW", "HELLO WORLD"];
+	int fn = 1;
+	string[] labels = ["HELLO WORLD", "LLOHE WODRL", "OLLEH ORLWD", "LOHEL LODRW"];
 
 	public Issue24414()
 	{
@@ -24,14 +24,14 @@ private void OnTapGestureRecognizerTapped(object sender, EventArgs e)
 			{
 				switch (fn)
 				{
-					case 0:
+					case 1:
 						border.WidthRequest += 4;
 						border.HeightRequest += 4;
 						break;
-					case 1:
+					case 2:
 						border.StrokeShape = new RoundRectangle { CornerRadius = border.WidthRequest };
 						break;
-					case 2:
+					case 3:
 						border.Shadow.Radius -= 8;
 						break;
 				}
@@ -51,9 +51,9 @@ void UpdateLabel()
 	{
 		TheLabel.Text = fn switch
 		{
-			0 => "Tap to resize the border",
-			1 => "Tap to change the border shape",
-			2 => "Tap to change the shadow radius",
+			1 => "Tap to resize the border",
+			2 => "Tap to change the border shape",
+			3 => "Tap to change the shadow radius",
 			_ => "Done"
 		};
 	}
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24414.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24414.cs
index 89ef07340c08..c9599a06884c 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24414.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24414.cs
@@ -16,8 +16,34 @@ public Issue24414(TestDevice device)
 		[Category(UITestCategories.Visual)]
 		public void Issue24414Test()
 		{
-			App.WaitForElement("WaitForStubControl");
-			VerifyScreenshot();
+			var label = App.WaitForElement("TheLabel");
+			var ex = TryVerifyScreenshot();
+
+			for (int i = 1; i <= 3; i++)
+			{
+				label.Tap();
+				var exception = TryVerifyScreenshot("Issue24414Test_" + i);
+				ex ??= exception;
+			}
+
+			if (ex != null)
+			{
+				throw ex;
+			}
+		}
+
+		private Exception? TryVerifyScreenshot(string fileName)
+		{
+			try
+			{
+				App.Screenshot(fileName);
+			}
+			catch(Exception ex)
+			{
+				return ex;
+			}
+
+			return null;
 		}
 	}
 }
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test.png
index 76e1c23ff08c..2378279e20ae 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test_1.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test_1.png
new file mode 100644
index 000000000000..c55644d1554f
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test_1.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test_2.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test_2.png
new file mode 100644
index 000000000000..4c533bbf33f1
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test_2.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test_3.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test_3.png
new file mode 100644
index 000000000000..a641b10335b2
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test_3.png differ
diff --git a/src/Core/AndroidNative/maui/src/main/java/com/microsoft/maui/PlatformWrapperView.java b/src/Core/AndroidNative/maui/src/main/java/com/microsoft/maui/PlatformWrapperView.java
index b812a1cbb5de..e97c759858a8 100644
--- a/src/Core/AndroidNative/maui/src/main/java/com/microsoft/maui/PlatformWrapperView.java
+++ b/src/Core/AndroidNative/maui/src/main/java/com/microsoft/maui/PlatformWrapperView.java
@@ -182,9 +182,10 @@ protected void drawShadow(@NonNull Canvas canvas, int viewWidth, int viewHeight)
     }
 
     private void drawShadowViaPlatformShadowDrawable(@NonNull Canvas canvas, @NonNull PlatformShadowDrawable drawable, int viewWidth, int viewHeight) {
-        int bitmapWidth = viewWidth + (int)(radius * 2.5);
-        int bitmapHeight = viewHeight + (int)(radius * 2.5);
-            
+        int radiusSafeSpace = getRadiusSafeSpace();
+        int bitmapWidth = viewWidth + radiusSafeSpace;
+        int bitmapHeight = viewHeight + radiusSafeSpace;
+
         // Apply shader if needed
         Shader shader = createShader(bitmapWidth, bitmapHeight);
         if (shader != null) {
@@ -200,14 +201,9 @@ private void drawShadowViaPlatformShadowDrawable(@NonNull Canvas canvas, @NonNul
     }
 
     private void drawShadowViaDispatchDraw(@NonNull Canvas canvas, int viewWidth, int viewHeight) {
-        int radius = (int)this.radius;
-        // Give it a minimum additional space to draw shadow
-        if (radius <= 0) {
-            radius = 1;
-        }
-
-        int bitmapWidth = viewWidth + radius * 2;
-        int bitmapHeight = viewHeight + radius * 2;
+        int radiusSafeSpace = getRadiusSafeSpace();
+        int bitmapWidth = viewWidth + radiusSafeSpace;
+        int bitmapHeight = viewHeight + radiusSafeSpace;
         int drawOriginX = (bitmapWidth - viewWidth) / 2;
         int drawOriginY = (bitmapHeight - viewHeight) / 2;
 
@@ -235,16 +231,16 @@ private void drawShadowViaDispatchDraw(@NonNull Canvas canvas, int viewWidth, in
 
             // Get the alpha bounds of bitmap
             Bitmap extractAlpha = shadowBitmap.extractAlpha();
-            
+
             // Clear the shadow canvas
             shadowCanvas.drawColor(Color.BLACK, PorterDuff.Mode.CLEAR);
-            
+
             // Apply shader if needed
             Shader shader = createShader(bitmapWidth, bitmapHeight);
             if (shader != null) {
                 shadowPaint.setShader(shader);
             }
-            
+
             shadowCanvas.drawBitmap(extractAlpha, 0, 0, shadowPaint);
 
             extractAlpha.recycle();
@@ -254,6 +250,14 @@ private void drawShadowViaDispatchDraw(@NonNull Canvas canvas, int viewWidth, in
         canvas.drawBitmap(shadowBitmap, offsetX - drawOriginX, offsetY - drawOriginY, null);
     }
 
+    private int getRadiusSafeSpace() {
+        if (radius <= 0) {
+            return 4;
+        }
+
+        return (int)(radius * 3);
+    }
+
     private Shader createShader(int bitmapWidth, int bitmapHeight) {
         Shader shader = null;
 
diff --git a/src/Core/src/maui.aar b/src/Core/src/maui.aar
index e946826f339c..d721f3c3206f 100644
Binary files a/src/Core/src/maui.aar and b/src/Core/src/maui.aar differ