diff --git a/Directory.Build.props b/Directory.Build.props
index d1825cea9f..51c6c1b95f 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -170,6 +170,7 @@
      xUnit3002: Classes which are JSON serializable should not be tested for their concrete type
      XC0045: Binding: Property not found
      XC0103: Consider attributing the markup extension with [RequireService] or [AcceptEmptyServiceProvider] if it doesn't require any
+     XC0618: Property, Property setter or BindableProperty "BackgroundColor" is deprecated
      IL2***: Trim Warnings     
      IL3***: AOT Warnings     
      RS2007: Analyzer release file 'AnalyzerReleases.Shipped.md' has a missing or invalid release header-->
@@ -182,7 +183,7 @@
       xUnit1000,xUnit1001,xUnit1002,xUnit1003,xUnit1004,xUnit1005,xUnit1006,xUnit1007,xUnit1008,xUnit1009,xUnit1010,xUnit1011,xUnit1012,xUnit1013,xUnit1014,xUnit1015,xUnit1016,xUnit1017,xUnit1018,xUnit1019,xUnit1020,xUnit1021,xUnit1022,xUnit1023,xUnit1024,xUnit1025,xUnit1026,xUnit1027,xUnit1028,xUnit1029,xUnit1030,xUnit1031,xUnit1032,xUnit1033,xUnit1034,xUnit1035,xUnit1036,xUnit1037,xUnit1038,xUnit1039,xUnit1040,xUnit1041,xUnit1042,xUnit1043,xUnit1048,xUnit1049,xUnit1050,xUnit1051,
       xUnit2000,xUnit2001,xUnit2002,xUnit2003,xUnit2004,xUnit2005,xUnit2006,xUnit2007,xUnit2008,xUnit2009,xUnit2010,xUnit2011,xUnit2012,xUnit2013,xUnit2014,xUnit2015,xUnit2016,xUnit2017,xUnit2018,xUnit2019,xUnit2020,xUnit2021,xUnit2022,xUnit2023,xUnit2024,xUnit2025,xUnit2026,xUnit2027,xUnit2028,xUnit2029,xUnit2030,xUnit2031,xUnit2032,
       xUnit3000,xUnit3001,xUnit3002,
-      XC0045,XC0103,
+      XC0045,XC0103,XC0618,
       IL2001,IL2002,IL2003,IL2004,IL2005,IL2006,IL2007,IL2008,IL2009,
       IL2010,IL2011,IL2012,IL2013,IL2014,IL2015,IL2016,IL2017,IL2018,IL2019,
       IL2020,IL2021,IL2022,IL2023,IL2024,IL2025,IL2026,IL2027,IL2028,IL2029,
diff --git a/samples/CommunityToolkit.Maui.Sample/App.xaml b/samples/CommunityToolkit.Maui.Sample/App.xaml
index a513007377..9167b3b42b 100644
--- a/samples/CommunityToolkit.Maui.Sample/App.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/App.xaml
@@ -10,42 +10,34 @@
             </ResourceDictionary.MergedDictionaries>
 
             <Style TargetType="{x:Type popups:ImplicitStylePopup}">
-                <Setter Property="Size" Value="100,100" />
-                <Setter Property="Color" Value="Red" />
-                <Setter Property="HorizontalOptions" Value="Start" />
-                <Setter Property="VerticalOptions" Value="Start" />
-                <Setter Property="CanBeDismissedByTappingOutsideOfPopup" Value="True" />
+                <Setter Property="WidthRequest" Value="100" />
+                <Setter Property="HeightRequest" Value="100" />
+                <Setter Property="BackgroundColor" Value="Red" />
             </Style>
 
             <Style x:Key="ExplicitPopupStyle" TargetType="{x:Type popups:ExplicitStylePopup}">
-                <Setter Property="Size" Value="200,100" />
-                <Setter Property="Color" Value="Yellow" />
-                <Setter Property="HorizontalOptions" Value="End" />
-                <Setter Property="VerticalOptions" Value="Start" />
-                <Setter Property="CanBeDismissedByTappingOutsideOfPopup" Value="True" />
+                <Setter Property="WidthRequest" Value="200" />
+                <Setter Property="HeightRequest" Value="100" />
+                <Setter Property="BackgroundColor" Value="Yellow" />
             </Style>
 
             <Style x:Key="BasePopupStyle" TargetType="{x:Type popups:StyleInheritancePopup}">
-                <Setter Property="Size" Value="200,200" />
+                <Setter Property="WidthRequest" Value="200" />
+                <Setter Property="HeightRequest" Value="200" />
             </Style>
             <Style x:Key="InheritancePopupStyle" TargetType="{x:Type popups:StyleInheritancePopup}" BasedOn="{StaticResource BasePopupStyle}">
-                <Setter Property="Color" Value="SkyBlue" />
-                <Setter Property="HorizontalOptions" Value="End" />
-                <Setter Property="VerticalOptions" Value="End" />
-                <Setter Property="CanBeDismissedByTappingOutsideOfPopup" Value="True" />
+                <Setter Property="BackgroundColor" Value="SkyBlue" />
             </Style>
 
             <Style x:Key="DynamicBasePopupStyle" TargetType="{x:Type popups:DynamicStyleInheritancePopup}">
-                <Setter Property="Size" Value="150,150" />
+                <Setter Property="WidthRequest" Value="150" />
+                <Setter Property="HeightRequest" Value="150" />
             </Style>
             <Style x:Key="DynamicInheritancePopupStyle1" TargetType="{x:Type popups:DynamicStyleInheritancePopup}" BasedOn="{StaticResource DynamicBasePopupStyle}">
-                <Setter Property="Color" Value="Purple" />
-                <Setter Property="VerticalOptions" Value="End" />
+                <Setter Property="BackgroundColor" Value="Purple" />
             </Style>
             <Style x:Key="DynamicInheritancePopupStyle2" TargetType="{x:Type popups:DynamicStyleInheritancePopup}" BaseResourceKey="DynamicInheritancePopupStyle1">
-                <Setter Property="Color" Value="Orange" />
-                <Setter Property="HorizontalOptions" Value="End" />
-                <Setter Property="CanBeDismissedByTappingOutsideOfPopup" Value="True" />
+                <Setter Property="BackgroundColor" Value="Orange" />
             </Style>
             
         </ResourceDictionary>
diff --git a/samples/CommunityToolkit.Maui.Sample/AppShell.xaml.cs b/samples/CommunityToolkit.Maui.Sample/AppShell.xaml.cs
index 18600e20b9..12721c1b46 100644
--- a/samples/CommunityToolkit.Maui.Sample/AppShell.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/AppShell.xaml.cs
@@ -120,7 +120,6 @@ public partial class AppShell : Shell
 		CreateViewModelMapping<AvatarViewSizesPage, AvatarViewSizesViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
 		CreateViewModelMapping<BasicMapsPage, BasicMapsViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
 		CreateViewModelMapping<CameraViewPage, CameraViewViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
-		CreateViewModelMapping<CustomSizeAndPositionPopupPage, CustomSizeAndPositionPopupViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
 		CreateViewModelMapping<DrawingViewPage, DrawingViewViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
 		CreateViewModelMapping<ExpanderPage, ExpanderViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
 		CreateViewModelMapping<LazyViewPage, LazyViewViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
@@ -129,17 +128,16 @@ public partial class AppShell : Shell
 		CreateViewModelMapping<MediaElementCarouselViewPage, MediaElementCarouselViewViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
 		CreateViewModelMapping<MediaElementCollectionViewPage, MediaElementCollectionViewViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
 		CreateViewModelMapping<MediaElementMultipleWindowsPage, MediaElementMultipleWindowsViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
-		CreateViewModelMapping<MultiplePopupPage, MultiplePopupViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
-		CreateViewModelMapping<PopupAnchorPage, PopupAnchorViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
+		CreateViewModelMapping<SemanticOrderViewPage, SemanticOrderViewPageViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
+		CreateViewModelMapping<PopupsPage, PopupsViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
 		CreateViewModelMapping<PopupLayoutAlignmentPage, PopupLayoutAlignmentViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
 		CreateViewModelMapping<PopupPositionPage, PopupPositionViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
 		CreateViewModelMapping<PopupSizingIssuesPage, PopupSizingIssuesViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
+		CreateViewModelMapping<ShowPopupInOnAppearingPage, ShowPopupInOnAppearingPageViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
+		CreateViewModelMapping<StylePopupPage, StylePopupViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
 		CreateViewModelMapping<RatingViewCsharpPage, RatingViewCsharpViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
 		CreateViewModelMapping<RatingViewShowcasePage, RatingViewShowcaseViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
 		CreateViewModelMapping<RatingViewXamlPage, RatingViewXamlViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
-		CreateViewModelMapping<SemanticOrderViewPage, SemanticOrderViewPageViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
-		CreateViewModelMapping<ShowPopupInOnAppearingPage, ShowPopupInOnAppearingPageViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
-		CreateViewModelMapping<StylePopupPage, StylePopupViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
 
 		// Add PlatformSpecific View Models
 		CreateViewModelMapping<NavigationBarPage, NavigationBarAndroidViewModel, PlatformSpecificGalleryPage, PlatformSpecificGalleryViewModel>()
diff --git a/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj b/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
index 05c803ebd2..786e13f8a8 100644
--- a/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
+++ b/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
@@ -35,10 +35,10 @@
     <NoWarn>CsWinRT1028</NoWarn>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)' == 'Release' 
-                 AND $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) != 'tizen'
-                 AND $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) != 'android'
-                 AND $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) != 'windows'">
+  <PropertyGroup Condition="'$(Configuration)' == 'Release'
+                              AND $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) != 'tizen'
+                              AND $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) != 'android'
+                              AND $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) != 'windows'">
     <!-- Ahead-of-time compilation is not yet supported net8.0-tizen -->
     <!-- Cross-OS native compilation is not supported net8.0-android -->
     <!-- Only iOS + MacCatalyst support AOT in .NET 9 -->
diff --git a/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs b/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs
index c7268cc8be..095d44bca5 100644
--- a/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs
+++ b/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs
@@ -2,7 +2,6 @@
 using CommunityToolkit.Maui.ApplicationModel;
 using CommunityToolkit.Maui.Markup;
 using CommunityToolkit.Maui.Media;
-using CommunityToolkit.Maui.Sample.Models;
 using CommunityToolkit.Maui.Sample.Pages;
 using CommunityToolkit.Maui.Sample.Pages.Alerts;
 using CommunityToolkit.Maui.Sample.Pages.Behaviors;
@@ -120,7 +119,6 @@ public static MauiApp CreateMauiApp()
 						.AddStandardResilienceHandler(static options => options.Retry = new MobileHttpRetryStrategyOptions());
 
 		builder.Services.AddSingleton<AppShell>();
-		builder.Services.AddSingleton<PopupSizeConstants>();
 
 		RegisterViewsAndViewModels(builder.Services);
 		RegisterEssentials(builder.Services);
@@ -245,7 +243,6 @@ static void RegisterViewsAndViewModels(in IServiceCollection services)
 		// Add Views Pages + ViewModels
 		services.AddTransientWithShellRoute<BasicMapsPage, BasicMapsViewModel>();
 		services.AddTransientWithShellRoute<CameraViewPage, CameraViewViewModel>();
-		services.AddTransientWithShellRoute<CustomSizeAndPositionPopupPage, CustomSizeAndPositionPopupViewModel>();
 		services.AddTransientWithShellRoute<DrawingViewPage, DrawingViewViewModel>();
 		services.AddTransientWithShellRoute<ExpanderPage, ExpanderViewModel>();
 		services.AddTransientWithShellRoute<LazyViewPage, LazyViewViewModel>();
@@ -254,8 +251,7 @@ static void RegisterViewsAndViewModels(in IServiceCollection services)
 		services.AddTransientWithShellRoute<MediaElementCarouselViewPage, MediaElementCarouselViewViewModel>();
 		services.AddTransientWithShellRoute<MediaElementCollectionViewPage, MediaElementCollectionViewViewModel>();
 		services.AddTransientWithShellRoute<MediaElementMultipleWindowsPage, MediaElementMultipleWindowsViewModel>();
-		services.AddTransientWithShellRoute<MultiplePopupPage, MultiplePopupViewModel>();
-		services.AddTransientWithShellRoute<PopupAnchorPage, PopupAnchorViewModel>();
+		services.AddTransientWithShellRoute<PopupsPage, PopupsViewModel>();
 		services.AddTransientWithShellRoute<PopupLayoutAlignmentPage, PopupLayoutAlignmentViewModel>();
 		services.AddTransientWithShellRoute<PopupPositionPage, PopupPositionViewModel>();
 		services.AddTransientWithShellRoute<RatingViewCsharpPage, RatingViewCsharpViewModel>();
@@ -267,7 +263,24 @@ static void RegisterViewsAndViewModels(in IServiceCollection services)
 		services.AddTransientWithShellRoute<PopupSizingIssuesPage, PopupSizingIssuesViewModel>();
 
 		// Add Popups
+		services.AddTransientPopup<ApplyToDerivedTypesPopup>();
+		services.AddTransientPopup<ButtonPopup>();
 		services.AddTransientPopup<CsharpBindingPopup, CsharpBindingPopupViewModel>();
+		services.AddTransientPopup<DynamicStyleInheritancePopup>();
+		services.AddTransientPopup<DynamicStylePopup>();
+		services.AddTransientPopup<ExplicitStylePopup>();
+		services.AddTransientPopup<ImplicitStylePopup>();
+		services.AddTransientPopup<MultipleButtonPopup>();
+		services.AddTransientPopup<NoOutsideTapDismissPopup>();
+		services.AddTransientPopup<OpenedEventSimplePopup>();
+		services.AddTransientPopup<PopupContentView, PopupContentViewModel>();
+		services.AddTransientPopup<RedBlueBoxPopup>();
+		services.AddTransientPopup<ReturnResultPopup>();
+		services.AddTransientPopup<SimplePopup>();
+		services.AddTransientPopup<StyleClassPopup>();
+		services.AddTransientPopup<StyleInheritancePopup>();
+		services.AddTransientPopup<ToggleSizePopup>();
+		services.AddTransientPopup<TransparentPopup>();
 		services.AddTransientPopup<UpdatingPopup, UpdatingPopupViewModel>();
 		services.AddTransientPopup<XamlBindingPopup, XamlBindingPopupViewModel>();
 	}
diff --git a/samples/CommunityToolkit.Maui.Sample/Models/PopupSize.cs b/samples/CommunityToolkit.Maui.Sample/Models/PopupSize.cs
deleted file mode 100644
index 88cef5a44d..0000000000
--- a/samples/CommunityToolkit.Maui.Sample/Models/PopupSize.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace CommunityToolkit.Maui.Sample.Models;
-
-public class PopupSizeConstants
-{
-	public PopupSizeConstants(IDeviceDisplay deviceDisplay)
-	{
-		Tiny = new(100, 100);
-		Small = new(300, 300);
-		Medium = new(0.4 * (deviceDisplay.MainDisplayInfo.Width / deviceDisplay.MainDisplayInfo.Density), 0.6 * (deviceDisplay.MainDisplayInfo.Height / deviceDisplay.MainDisplayInfo.Density));
-		Large = new(0.5 * (deviceDisplay.MainDisplayInfo.Width / deviceDisplay.MainDisplayInfo.Density), 0.8 * (deviceDisplay.MainDisplayInfo.Height / deviceDisplay.MainDisplayInfo.Density));
-	}
-
-	// examples for fixed sizes
-	public Size Tiny { get; }
-
-	public Size Small { get; }
-
-	// examples for relative to screen sizes
-	public Size Medium { get; }
-
-	public Size Large { get; }
-}
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/MediaElement/MediaElementPage.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Views/MediaElement/MediaElementPage.xaml.cs
index 819e1c9441..4963bdeafe 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/MediaElement/MediaElementPage.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/MediaElement/MediaElementPage.xaml.cs
@@ -1,9 +1,9 @@
 using System.ComponentModel;
 using CommunityToolkit.Maui.Core.Primitives;
+using CommunityToolkit.Maui.Extensions;
 using CommunityToolkit.Maui.Sample.ViewModels.Views;
 using CommunityToolkit.Maui.Views;
 using Microsoft.Extensions.Logging;
-using LayoutAlignment = Microsoft.Maui.Primitives.LayoutAlignment;
 
 namespace CommunityToolkit.Maui.Sample.Pages.Views;
 
@@ -243,35 +243,18 @@ async void ChangeAspectClicked(object? sender, EventArgs e)
 		MediaElement.Aspect = (Aspect)aspectEnum;
 	}
 
-	void DisplayPopup(object sender, EventArgs e)
+	async void DisplayPopup(object sender, EventArgs e)
 	{
 		MediaElement.Pause();
 		var popupMediaElement = new MediaElement
 		{
 			Source = MediaSource.FromResource("AppleVideo.mp4"),
-			HeightRequest = 600,
-			WidthRequest = 600,
 			ShouldAutoPlay = true,
 			ShouldShowPlaybackControls = true,
 		};
-		var popup = new Popup
-		{
-			VerticalOptions = LayoutAlignment.Center,
-			HorizontalOptions = LayoutAlignment.Center,
-			Content = new StackLayout
-			{
-				Children =
-				{
-					popupMediaElement,
-				}
-			}
-		};
 
-		this.ShowPopup(popup);
-		popup.Closed += (s, e) =>
-		{
-			popupMediaElement.Stop();
-			popupMediaElement.Handler?.DisconnectHandler();
-		};
+		await this.ShowPopupAsync(popupMediaElement);
+		popupMediaElement.Stop();
+		popupMediaElement.Handler?.DisconnectHandler();
 	}
 }
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/CustomSizeAndPositionPopupPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/CustomSizeAndPositionPopupPage.xaml
deleted file mode 100644
index bdbb5ec219..0000000000
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/CustomSizeAndPositionPopupPage.xaml
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<pages:BasePage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-                xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-                xmlns:pages="clr-namespace:CommunityToolkit.Maui.Sample.Pages"
-                xmlns:viewModels="clr-namespace:CommunityToolkit.Maui.Sample.ViewModels.Views"
-                x:Class="CommunityToolkit.Maui.Sample.Pages.Views.CustomSizeAndPositionPopupPage"
-                Title="Custom Popup Size and Position"
-                x:TypeArguments="viewModels:CustomSizeAndPositionPopupViewModel"
-                x:DataType="viewModels:CustomSizeAndPositionPopupViewModel">
-
-    <ContentPage.Resources>
-        <ControlTemplate x:Key="RadioButtonTemplate">
-            <Border Stroke="#F3F2F1"
-                    StrokeThickness="2"
-                    StrokeShape="RoundRectangle 10"
-                    BackgroundColor="#F3F2F1"
-                    HeightRequest="90"
-                    WidthRequest="90"
-                    HorizontalOptions="Start"
-                    VerticalOptions="Start">
-                <VisualStateManager.VisualStateGroups>
-                    <VisualStateGroupList>
-                        <VisualStateGroup x:Name="CheckedStates">
-                            <VisualState x:Name="Checked">
-                                <VisualState.Setters>
-                                    <Setter TargetName="check"
-                                            Property="Opacity"
-                                            Value="1" />
-                                </VisualState.Setters>
-                            </VisualState>
-                            <VisualState x:Name="Unchecked">
-                                <VisualState.Setters>
-                                    <Setter TargetName="check"
-                                            Property="Opacity"
-                                            Value="0" />
-                                </VisualState.Setters>
-                            </VisualState>
-                        </VisualStateGroup>
-                    </VisualStateGroupList>
-                </VisualStateManager.VisualStateGroups>
-                <Grid Margin="4"
-                      WidthRequest="90"
-                      BackgroundColor="Transparent">
-                    <Grid Margin="0,0,4,0"
-                          WidthRequest="18"
-                          HeightRequest="18"
-                          HorizontalOptions="End"
-                          VerticalOptions="Start">
-                        <Ellipse Stroke="Blue"
-                                 Fill="White"
-                                 WidthRequest="16"
-                                 HeightRequest="16"
-                                 HorizontalOptions="Center"
-                                 VerticalOptions="Center" />
-                        <Ellipse x:Name="check"
-                                 Fill="Blue"
-                                 WidthRequest="8"
-                                 HeightRequest="8"
-                                 HorizontalOptions="Center"
-                                 VerticalOptions="Center" />
-                    </Grid>
-                    <ContentPresenter />
-                </Grid>
-            </Border>
-        </ControlTemplate>
-
-        <Style TargetType="RadioButton">
-            <Setter Property="ControlTemplate" Value="{StaticResource RadioButtonTemplate}" />
-        </Style>
-    </ContentPage.Resources>
-
-    <Grid RowDefinitions="24,36,24,100,24,100,24,36,24,36,44"
-          ColumnDefinitions="*,*,*,*"
-          RowSpacing="8"
-          ColumnSpacing="4">
-
-        <Label Grid.Row="0"
-               Grid.ColumnSpan="4"
-               Text="FlowDirection"
-               VerticalOptions="Center"
-               FontAttributes="Bold" />
-
-        <Picker Grid.Row="1"
-                Grid.ColumnSpan="4"
-                SelectedIndex="{Binding FlowDirectionSelectedIndex}"
-                ItemsSource="{Binding FlowDirectionOptions, Mode=OneTime}" />
-
-        <Label Grid.Row="2"
-               Grid.ColumnSpan="4"
-               Text="HorizontalOptions"
-               VerticalOptions="Center"
-               FontAttributes="Bold" />
-
-        <RadioButton Grid.Row="3"
-                     Grid.Column="0"
-                     IsChecked="{Binding IsStartHorizontalOptionSelected}"
-                     GroupName="HorizontalRadioButtonGroup">
-            <RadioButton.Content>
-                <Label Text="Start" TextColor="Black" VerticalTextAlignment="Center" Margin="4,0,0,0" />
-            </RadioButton.Content>
-        </RadioButton>
-
-        <RadioButton Grid.Row="3"
-                     Grid.Column="1"
-                     IsChecked="{Binding IsCenterHorizontalOptionSelected}"
-                     GroupName="HorizontalRadioButtonGroup">
-            <RadioButton.Content>
-                <Label Text="Center" TextColor="Black" VerticalTextAlignment="Center" Margin="4,0,0,0" />
-            </RadioButton.Content>
-        </RadioButton>
-
-        <RadioButton Grid.Row="3"
-                     Grid.Column="2"
-                     IsChecked="{Binding IsEndHorizontalOptionSelected}"
-                     GroupName="HorizontalRadioButtonGroup">
-            <RadioButton.Content>
-                <Label Text="End" TextColor="Black" VerticalTextAlignment="Center" Margin="4,0,0,0" />
-            </RadioButton.Content>
-        </RadioButton>
-
-        <RadioButton Grid.Row="3"
-                     Grid.Column="3"
-                     IsChecked="{Binding IsFillHorizontalOptionSelected}"
-                     GroupName="HorizontalRadioButtonGroup">
-            <RadioButton.Content>
-                <Label Text="Fill" TextColor="Black" VerticalTextAlignment="Center" Margin="4,0,0,0" />
-            </RadioButton.Content>
-        </RadioButton>
-
-        <Label Text="VerticalOptions"
-               VerticalOptions="Center"
-               FontAttributes="Bold"
-               Grid.Row="4"
-               Grid.ColumnSpan="4" />
-
-        <RadioButton Grid.Row="5"
-                     Grid.Column="0"
-                     IsChecked="{Binding IsStartVerticalOptionSelected}"
-                     GroupName="VerticalRadioButtonGroup">
-            <RadioButton.Content>
-                <Label Text="Start" TextColor="Black" VerticalTextAlignment="Center" Margin="4,0,0,0" />
-            </RadioButton.Content>
-        </RadioButton>
-
-        <RadioButton Grid.Row="5"
-                     Grid.Column="1"
-                     IsChecked="{Binding IsCenterVerticalOptionSelected}"
-                     GroupName="VerticalRadioButtonGroup">
-            <RadioButton.Content>
-                <Label Text="Center" TextColor="Black" VerticalTextAlignment="Center" Margin="4,0,0,0" />
-            </RadioButton.Content>
-        </RadioButton>
-
-        <RadioButton Grid.Row="5"
-                     Grid.Column="2"
-                     IsChecked="{Binding IsEndVerticalOptionSelected}"
-                     GroupName="VerticalRadioButtonGroup">
-            <RadioButton.Content>
-                <Label Text="End" TextColor="Black" VerticalTextAlignment="Center" Margin="4,0,0,0" />
-            </RadioButton.Content>
-        </RadioButton>
-
-        <RadioButton Grid.Row="5"
-                     Grid.Column="3"
-                     IsChecked="{Binding IsFillVerticalOptionSelected}"
-                     GroupName="VerticalRadioButtonGroup">
-            <RadioButton.Content>
-                <Label Text="Fill" TextColor="Black" VerticalTextAlignment="Center" Margin="4,0,0,0" />
-            </RadioButton.Content>
-        </RadioButton>
-
-        <Label Grid.Row="6"
-               Grid.ColumnSpan="4"
-               Text="Width"
-               VerticalOptions="Center"
-               FontAttributes="Bold" />
-
-        <Entry Grid.Row="7"
-               Grid.Column="0"
-               Text="{Binding Width}"
-               Placeholder="100"
-               Keyboard="Numeric"
-               HorizontalTextAlignment="End" />
-
-        <Label Grid.Row="8"
-               Grid.ColumnSpan="4"
-               Text="Height"
-               VerticalOptions="Center"
-               FontAttributes="Bold" />
-
-        <Entry Grid.Row="9"
-               Grid.Column="0"
-               Text="{Binding Height}"
-               Placeholder="100"
-               Keyboard="Numeric"
-               HorizontalTextAlignment="End" />
-
-        <Button Grid.Row="10"
-                Grid.ColumnSpan="4"
-                Text="Show"
-                TextColor="White"
-                HorizontalOptions="Center"
-                Command="{Binding ExecuteShowButtonCommand, Mode=OneTime}" />
-    </Grid>
-</pages:BasePage>
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/CustomSizeAndPositionPopupPage.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/CustomSizeAndPositionPopupPage.xaml.cs
deleted file mode 100644
index ec36628879..0000000000
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/CustomSizeAndPositionPopupPage.xaml.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using CommunityToolkit.Maui.Sample.ViewModels.Views;
-
-namespace CommunityToolkit.Maui.Sample.Pages.Views;
-
-public partial class CustomSizeAndPositionPopupPage : BasePage<CustomSizeAndPositionPopupViewModel>
-{
-	public CustomSizeAndPositionPopupPage(CustomSizeAndPositionPopupViewModel viewModel) : base(viewModel)
-	{
-		InitializeComponent();
-	}
-
-	protected override void OnAppearing()
-	{
-		base.OnAppearing();
-
-		//Required to ensure the FlowDirection Picker is populated with a default value
-		// Without this, the FlowDirection Picker selection is uninitialized
-		BindingContext.FlowDirectionSelectedIndex = 1;
-	}
-}
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/MultiplePopupPage.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/MultiplePopupPage.xaml.cs
deleted file mode 100644
index e745e4f0f5..0000000000
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/MultiplePopupPage.xaml.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using CommunityToolkit.Maui.Sample.Models;
-using CommunityToolkit.Maui.Sample.ViewModels.Views;
-using CommunityToolkit.Maui.Sample.Views.Popups;
-using CommunityToolkit.Maui.Views;
-
-namespace CommunityToolkit.Maui.Sample.Pages.Views;
-
-public partial class MultiplePopupPage : BasePage<MultiplePopupViewModel>
-{
-	readonly PopupSizeConstants popupSizeConstants;
-
-	public MultiplePopupPage(PopupSizeConstants popupSizeConstants,
-								MultiplePopupViewModel multiplePopupViewModel)
-		: base(multiplePopupViewModel)
-	{
-		InitializeComponent();
-
-		this.popupSizeConstants = popupSizeConstants;
-	}
-
-	async void HandleSimplePopupButtonClicked(object sender, EventArgs e)
-	{
-		var simplePopup = new SimplePopup(popupSizeConstants);
-		await this.ShowPopupAsync(simplePopup, CancellationToken.None);
-	}
-
-	async void HandleButtonPopupButtonClicked(object sender, EventArgs e)
-	{
-		var buttonPopup = new ButtonPopup(popupSizeConstants);
-		await this.ShowPopupAsync(buttonPopup, CancellationToken.None);
-	}
-
-	async void HandleMultipleButtonPopupButtonClicked(object sender, EventArgs e)
-	{
-		var multipleButtonPopup = new MultipleButtonPopup(popupSizeConstants);
-		await this.ShowPopupAsync(multipleButtonPopup, CancellationToken.None);
-	}
-
-	async void HandleNoOutsideTapDismissPopupClicked(object sender, EventArgs e)
-	{
-		var noOutsideTapDismissPopup = new NoOutsideTapDismissPopup(popupSizeConstants);
-		await this.ShowPopupAsync(noOutsideTapDismissPopup, CancellationToken.None);
-	}
-
-	async void HandleToggleSizePopupButtonClicked(object sender, EventArgs e)
-	{
-		var toggleSizePopup = new ToggleSizePopup(popupSizeConstants);
-		await this.ShowPopupAsync(toggleSizePopup, CancellationToken.None);
-	}
-
-	async void HandleTransparentPopupButtonClicked(object sender, EventArgs e)
-	{
-		var transparentPopup = new TransparentPopup();
-		await this.ShowPopupAsync(transparentPopup, CancellationToken.None);
-	}
-
-	async void HandleOpenedEventSimplePopupButtonClicked(object sender, EventArgs e)
-	{
-		var openedEventSimplePopup = new OpenedEventSimplePopup(popupSizeConstants);
-		await this.ShowPopupAsync(openedEventSimplePopup, CancellationToken.None);
-	}
-
-	async void HandleReturnResultPopupButtonClicked(object sender, EventArgs e)
-	{
-		var returnResultPopup = new ReturnResultPopup(popupSizeConstants);
-		var result = await this.ShowPopupAsync(returnResultPopup, CancellationToken.None);
-
-		await DisplayAlert("Pop Result Returned", $"Result: {result}", "OK");
-	}
-
-	async void HandleXamlBindingPopupPopupButtonClicked(object sender, EventArgs e)
-	{
-		var xamlBindingPopup = new XamlBindingPopup(popupSizeConstants);
-		await this.ShowPopupAsync(xamlBindingPopup, CancellationToken.None);
-	}
-}
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupAnchorPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupAnchorPage.xaml
deleted file mode 100644
index 7870ea7061..0000000000
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupAnchorPage.xaml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<pages:BasePage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-                xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-                xmlns:pages="clr-namespace:CommunityToolkit.Maui.Sample.Pages"
-                xmlns:viewModels="clr-namespace:CommunityToolkit.Maui.Sample.ViewModels.Views"
-                x:Class="CommunityToolkit.Maui.Sample.Pages.Views.PopupAnchorPage"
-                Title="PopupAnchorPage"
-                x:TypeArguments="viewModels:PopupAnchorViewModel"
-                x:DataType="viewModels:PopupAnchorViewModel">
-
-    <ContentPage.Resources>
-        <ResourceDictionary>
-            <Style x:Key="BaseLabel" TargetType="Label">
-                <Setter Property="VerticalOptions" Value="CenterAndExpand" />
-                <Setter Property="HorizontalOptions" Value="CenterAndExpand" />
-            </Style>
-
-            <Style x:Key="Header" TargetType="Label" BasedOn="{StaticResource BaseLabel}">
-                <Setter Property="VerticalOptions" Value="CenterAndExpand" />
-                <Setter Property="HorizontalOptions" Value="CenterAndExpand" />
-                <Setter Property="Margin" Value="15, 10" />
-            </Style>
-
-            <Style x:Key="Indicator" TargetType="Label" BasedOn="{StaticResource BaseLabel}">
-                <Setter Property="FontSize" Value="24" />
-            </Style>
-
-            <Style TargetType="Button">
-                <Setter Property="VerticalOptions" Value="CenterAndExpand" />
-                <Setter Property="HorizontalOptions" Value="CenterAndExpand" />
-            </Style>
-        </ResourceDictionary>
-    </ContentPage.Resources>
-
-    <VerticalStackLayout>
-        <Label Style="{StaticResource Header}"
-                   Text="Popup's can be anchored to other Views on the page. Tap and drag the X to change where the popup will be centered." />
-
-        <Label x:Name="Indicator" 
-                   Style="{StaticResource Indicator}" 
-                   Text="❌">
-            <Label.GestureRecognizers>
-                <PanGestureRecognizer PanUpdated="OnPanUpdated" />
-            </Label.GestureRecognizers>
-        </Label>
-
-        <Button Text="Show Popup"
-                    Command="{Binding ShowPopupCommand}"
-                    CommandParameter="{x:Reference Indicator}"/>
-    </VerticalStackLayout>
-
-</pages:BasePage>
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupAnchorPage.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupAnchorPage.xaml.cs
deleted file mode 100644
index 651b6af60c..0000000000
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupAnchorPage.xaml.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using CommunityToolkit.Maui.Sample.ViewModels.Views;
-
-namespace CommunityToolkit.Maui.Sample.Pages.Views;
-
-public partial class PopupAnchorPage : BasePage<PopupAnchorViewModel>
-{
-	readonly IDeviceInfo deviceInfo;
-
-	public PopupAnchorPage(IDeviceInfo deviceInfo, PopupAnchorViewModel popupAnchorViewModel)
-		: base(popupAnchorViewModel)
-	{
-		InitializeComponent();
-
-		this.deviceInfo = deviceInfo;
-	}
-
-	void OnPanUpdated(object? sender, PanUpdatedEventArgs e)
-	{
-		ArgumentNullException.ThrowIfNull(sender);
-
-		var label = (Label)sender;
-
-		if (deviceInfo.Platform == DevicePlatform.Android)
-		{
-			label.TranslationX += e.TotalX;
-			label.TranslationY += e.TotalY;
-		}
-		else
-		{
-			switch (e.StatusType)
-			{
-				case GestureStatus.Running:
-					label.TranslationX = e.TotalX;
-					label.TranslationY = e.TotalY;
-					break;
-				case GestureStatus.Completed:
-					label.TranslationX += e.TotalX;
-					label.TranslationY += e.TotalY;
-					break;
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupLayoutAlignmentPage.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupLayoutAlignmentPage.xaml.cs
index bdefe04325..c9b893896b 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupLayoutAlignmentPage.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupLayoutAlignmentPage.xaml.cs
@@ -1,6 +1,6 @@
-using CommunityToolkit.Maui.Sample.ViewModels.Views;
+using CommunityToolkit.Maui.Extensions;
+using CommunityToolkit.Maui.Sample.ViewModels.Views;
 using CommunityToolkit.Maui.Sample.Views.Popups;
-using CommunityToolkit.Maui.Views;
 
 namespace CommunityToolkit.Maui.Sample.Pages.Views;
 
@@ -13,26 +13,23 @@ public PopupLayoutAlignmentPage(PopupLayoutAlignmentViewModel popupLayoutViewMod
 
 	void ShowPopupButtonClicked(object sender, EventArgs e)
 	{
-		var redBlueBoxPopup = new RedBlueBoxPopup
-		{
-			Size = new Size(double.Parse(widthEntry.Text), double.Parse(heightEntry.Text)),
-		};
+		LayoutOptions verticalOptions, horizontalOptions;
 
 		if (VerticalOptionsStartRadioButton.IsChecked)
 		{
-			redBlueBoxPopup.VerticalOptions = Microsoft.Maui.Primitives.LayoutAlignment.Start;
+			verticalOptions = LayoutOptions.Start;
 		}
 		else if (VerticalOptionsCenterRadioButton.IsChecked)
 		{
-			redBlueBoxPopup.VerticalOptions = Microsoft.Maui.Primitives.LayoutAlignment.Center;
+			verticalOptions = LayoutOptions.Center;
 		}
 		else if (VerticalOptionsEndRadioButton.IsChecked)
 		{
-			redBlueBoxPopup.VerticalOptions = Microsoft.Maui.Primitives.LayoutAlignment.End;
+			verticalOptions = LayoutOptions.End;
 		}
 		else if (VerticalOptionsFillRadioButton.IsChecked)
 		{
-			redBlueBoxPopup.VerticalOptions = Microsoft.Maui.Primitives.LayoutAlignment.Fill;
+			verticalOptions = LayoutOptions.Fill;
 		}
 		else
 		{
@@ -41,25 +38,35 @@ void ShowPopupButtonClicked(object sender, EventArgs e)
 
 		if (HorizontalOptionsStartRadioButton.IsChecked)
 		{
-			redBlueBoxPopup.HorizontalOptions = Microsoft.Maui.Primitives.LayoutAlignment.Start;
+			horizontalOptions = LayoutOptions.Start;
 		}
 		else if (HorizontalOptionsCenterRadioButton.IsChecked)
 		{
-			redBlueBoxPopup.HorizontalOptions = Microsoft.Maui.Primitives.LayoutAlignment.Center;
+			horizontalOptions = LayoutOptions.Center;
 		}
 		else if (HorizontalOptionsEndRadioButton.IsChecked)
 		{
-			redBlueBoxPopup.HorizontalOptions = Microsoft.Maui.Primitives.LayoutAlignment.End;
+			horizontalOptions = LayoutOptions.End;
 		}
 		else if (HorizontalOptionsFillRadioButton.IsChecked)
 		{
-			redBlueBoxPopup.HorizontalOptions = Microsoft.Maui.Primitives.LayoutAlignment.Fill;
+			horizontalOptions = LayoutOptions.Fill;
 		}
 		else
 		{
 			throw new InvalidOperationException("HorizontalOptions Radio Button Must Be Selected");
 		}
 
-		this.ShowPopup(redBlueBoxPopup);
+		this.ShowPopup(new RedBlueBoxPopup
+		{
+			VerticalOptions = verticalOptions,
+			HorizontalOptions = horizontalOptions,
+			Padding = 0,
+			WidthRequest = double.Parse(widthEntry.Text),
+			HeightRequest = double.Parse(heightEntry.Text)
+		}, new PopupOptions
+		{
+			Shape = null
+		});
 	}
 }
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupOnDisappearingPage.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupOnDisappearingPage.cs
new file mode 100644
index 0000000000..48a6eb0bb0
--- /dev/null
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupOnDisappearingPage.cs
@@ -0,0 +1,35 @@
+using CommunityToolkit.Maui.Extensions;
+using CommunityToolkit.Maui.Markup;
+using CommunityToolkit.Maui.Sample.Views.Popups;
+using CommunityToolkit.Mvvm.Input;
+
+namespace CommunityToolkit.Maui.Sample.Pages.Views.Popup;
+
+public class PopupOnDisappearingPage : ContentPage
+{
+	public PopupOnDisappearingPage()
+	{
+		Content = new VerticalStackLayout
+		{
+			Spacing = 12,
+			Children =
+			{
+				new Label().Text("This is a modal page. A popup will be displayed when this modal page is dismissed").Center().TextCenter(),
+				new Button
+				{
+					Command = new AsyncRelayCommand(() => Navigation.PopModalAsync())
+				}.Text("Go Back").Center()
+			}
+		}.Center();
+	}
+
+	protected override async void OnDisappearing()
+	{
+		base.OnDisappearing();
+
+		await this.ShowPopupAsync(new RedBlueBoxPopup().Padding(0), new PopupOptions
+		{
+			Shape = null,
+		});
+	}
+}
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupSizingIssuesPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupSizingIssuesPage.xaml
index 8d07c02fe0..932bed8eb4 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupSizingIssuesPage.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupSizingIssuesPage.xaml
@@ -3,7 +3,7 @@
                 xmlns:pages="clr-namespace:CommunityToolkit.Maui.Sample.Pages"
                 xmlns:viewModels="clr-namespace:CommunityToolkit.Maui.Sample.ViewModels.Views"
                 x:Class="CommunityToolkit.Maui.Sample.Pages.Views.PopupSizingIssuesPage"
-                Title="MultiplePopupPage"
+                Title="Popup Sizing Issues Page"
                 x:TypeArguments="viewModels:PopupSizingIssuesViewModel"
                 x:DataType="viewModels:PopupSizingIssuesViewModel"
                 x:Name="Self">
@@ -22,7 +22,7 @@
                 <Label Text="Margin" />
                 <Entry Text="{Binding Margin}" />
 
-                <Button Text="Show Popup" Command="{Binding ShowPopupCommand}" CommandParameter="{Binding Source={x:Reference Self}}" />
+                <Button Text="Show Popup" Command="{Binding ShowPopupCommand}"/>
             </VerticalStackLayout>
         </ScrollView>
     </ContentPage.Content>
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/MultiplePopupPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupsPage.xaml
similarity index 65%
rename from samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/MultiplePopupPage.xaml
rename to samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupsPage.xaml
index d05ab27ce4..5448130bdb 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/MultiplePopupPage.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupsPage.xaml
@@ -2,10 +2,10 @@
                 xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
                 xmlns:pages="clr-namespace:CommunityToolkit.Maui.Sample.Pages"
                 xmlns:viewModels="clr-namespace:CommunityToolkit.Maui.Sample.ViewModels.Views"
-                x:Class="CommunityToolkit.Maui.Sample.Pages.Views.MultiplePopupPage"
-                Title="MultiplePopupPage"
-                x:TypeArguments="viewModels:MultiplePopupViewModel"
-                x:DataType="viewModels:MultiplePopupViewModel">
+                x:Class="CommunityToolkit.Maui.Sample.Pages.Views.PopupsPage"
+                Title="Popups Page"
+                x:TypeArguments="viewModels:PopupsViewModel"
+                x:DataType="viewModels:PopupsViewModel">
 
     <ContentPage.Content>
         <ScrollView>
@@ -31,6 +31,20 @@
                 <Button Text="C# Binding Popup" Command="{Binding CsharpBindingPopupCommand}" />
 
                 <Button Text="Updating Popup" Command="{Binding UpdatingPopupCommand}" />
+
+                <Button Text="Show Popup content" Command="{Binding ShowPopupContentCommand}" />
+
+                <Button Text="Custom Positioning Popup" Clicked="HandlePopupPositionButtonClicked" />
+
+                <Button Text="Popup Layout Page" Clicked="HandlePopupLayoutAlignmentButtonClicked" />
+
+                <Button Text="Popup Sizing Issues Page" Clicked="HandlePopupSizingIssuesButtonClicked" />
+
+                <Button Text="Show Popup in OnAppearing" Clicked="HandleShowPopupInOnAppearingButtonClicked" />
+
+                <Button Text="Popup Style Page" Clicked="HandleStylePopupButtonClicked" />
+
+                <Button Text="OnDisappearing Popup" Clicked="HandleOnDisappearingPopupClicked" />
             </VerticalStackLayout>
         </ScrollView>
     </ContentPage.Content>
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupsPage.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupsPage.xaml.cs
new file mode 100644
index 0000000000..1681d37589
--- /dev/null
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupsPage.xaml.cs
@@ -0,0 +1,114 @@
+using CommunityToolkit.Maui.Sample.Pages.Views.Popup;
+using CommunityToolkit.Maui.Sample.ViewModels.Views;
+using CommunityToolkit.Maui.Sample.Views.Popups;
+using Microsoft.Maui.Controls.Shapes;
+
+namespace CommunityToolkit.Maui.Sample.Pages.Views;
+
+public partial class PopupsPage : BasePage<PopupsViewModel>
+{
+	readonly IPopupService popupService;
+
+	public PopupsPage(PopupsViewModel multiplePopupViewModel, IPopupService popupService)
+		: base(multiplePopupViewModel)
+	{
+		this.popupService = popupService;
+
+		InitializeComponent();
+	}
+
+	async void HandleSimplePopupButtonClicked(object sender, EventArgs e)
+	{
+		await popupService.ShowPopupAsync<SimplePopup>(Navigation, new PopupOptions
+		{
+			Shape = new RoundRectangle
+			{
+				CornerRadius = new CornerRadius(4),
+				Stroke = Colors.White
+			},
+		}, CancellationToken.None);
+	}
+
+	async void HandleButtonPopupButtonClicked(object sender, EventArgs e)
+	{
+		await popupService.ShowPopupAsync<ButtonPopup>(Navigation);
+	}
+
+	async void HandleMultipleButtonPopupButtonClicked(object sender, EventArgs e)
+	{
+		await popupService.ShowPopupAsync<MultipleButtonPopup, bool>(Navigation);
+	}
+
+	async void HandleNoOutsideTapDismissPopupClicked(object sender, EventArgs e)
+	{
+		await popupService.ShowPopupAsync<NoOutsideTapDismissPopup>(Navigation, new PopupOptions
+		{
+			CanBeDismissedByTappingOutsideOfPopup = false,
+		});
+	}
+
+	async void HandleToggleSizePopupButtonClicked(object sender, EventArgs e)
+	{
+		await popupService.ShowPopupAsync<ToggleSizePopup>(Navigation);
+	}
+
+	async void HandleTransparentPopupButtonClicked(object sender, EventArgs e)
+	{
+		await popupService.ShowPopupAsync<TransparentPopup>(Navigation);
+	}
+
+	async void HandleOpenedEventSimplePopupButtonClicked(object sender, EventArgs e)
+	{
+		await popupService.ShowPopupAsync<OpenedEventSimplePopup>(Navigation, new PopupOptions
+		{
+			Shape = new RoundRectangle
+			{
+				CornerRadius = new CornerRadius(20, 20, 20, 20),
+				StrokeThickness = 20,
+				Stroke = Colors.Blue
+			},
+		});
+	}
+
+	async void HandleReturnResultPopupButtonClicked(object sender, EventArgs e)
+	{
+		var result = await popupService.ShowPopupAsync<ReturnResultPopup, string>(Navigation);
+
+		await DisplayAlert("Pop Result Returned", $"Result: {result.Result ?? "Closed by tapping outside"}", "OK");
+	}
+
+	async void HandleXamlBindingPopupPopupButtonClicked(object sender, EventArgs e)
+	{
+		await popupService.ShowPopupAsync<XamlBindingPopup>(Navigation);
+	}
+
+	async void HandlePopupPositionButtonClicked(object sender, EventArgs e)
+	{
+		await Navigation.PushAsync(new PopupPositionPage(new PopupPositionViewModel()));
+	}
+
+	async void HandlePopupLayoutAlignmentButtonClicked(object sender, EventArgs e)
+	{
+		await Navigation.PushAsync(new PopupLayoutAlignmentPage(new PopupLayoutAlignmentViewModel()));
+	}
+
+	async void HandlePopupSizingIssuesButtonClicked(object sender, EventArgs e)
+	{
+		await Navigation.PushAsync(new PopupSizingIssuesPage(new PopupSizingIssuesViewModel()));
+	}
+
+	async void HandleShowPopupInOnAppearingButtonClicked(object sender, EventArgs e)
+	{
+		await Navigation.PushAsync(new ShowPopupInOnAppearingPage(new ShowPopupInOnAppearingPageViewModel(), popupService));
+	}
+
+	async void HandleStylePopupButtonClicked(object sender, EventArgs e)
+	{
+		await Navigation.PushAsync(new StylePopupPage(new StylePopupViewModel()));
+	}
+
+	async void HandleOnDisappearingPopupClicked(object sender, EventArgs e)
+	{
+		await Navigation.PushModalAsync(new PopupOnDisappearingPage());
+	}
+}
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/ShowPopupInOnAppearingPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/ShowPopupInOnAppearingPage.xaml
index d12c8c75e5..9601ea71df 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/ShowPopupInOnAppearingPage.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/ShowPopupInOnAppearingPage.xaml
@@ -7,10 +7,12 @@
                 Title="ShowPopupInOnAppearingPage"
                 x:TypeArguments="viewModels:ShowPopupInOnAppearingPageViewModel"
                 x:DataType="viewModels:ShowPopupInOnAppearingPageViewModel">
-    <VerticalStackLayout>
+    <VerticalStackLayout Spacing="12">
         <Label 
-            Text="Proves that we now support showing a popup before the platform is even ready."
-            VerticalOptions="Center" 
-            HorizontalOptions="Center" />
+            Text="This page demonstrates that we now support showing a popup before the platform is even ready."/>
+        <Label 
+            Text="Be careful displaying Popup in OnAppearing because OnAppearing will fire again when the Popup is closed." />
+        <Label 
+            Text="In this sample, we add `bool hasPopupBeenShown` to ensure we only display the Popup once in the OnAppearing method."/>
     </VerticalStackLayout>
 </pages:BasePage>
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/ShowPopupInOnAppearingPage.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/ShowPopupInOnAppearingPage.xaml.cs
index 0953b536d7..8dee02cdf7 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/ShowPopupInOnAppearingPage.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/ShowPopupInOnAppearingPage.xaml.cs
@@ -1,28 +1,29 @@
-using CommunityToolkit.Maui.Sample.Models;
 using CommunityToolkit.Maui.Sample.ViewModels.Views;
 using CommunityToolkit.Maui.Sample.Views.Popups;
-using CommunityToolkit.Maui.Views;
 
 namespace CommunityToolkit.Maui.Sample.Pages.Views;
 
 public partial class ShowPopupInOnAppearingPage : BasePage<ShowPopupInOnAppearingPageViewModel>
 {
-	readonly PopupSizeConstants popupSizeConstants;
+	readonly IPopupService popupService;
+	bool hasPopupBeenShown;
 
 	public ShowPopupInOnAppearingPage(
-		PopupSizeConstants popupSizeConstants,
-		ShowPopupInOnAppearingPageViewModel showPopupInOnAppearingPageViewModel)
+		ShowPopupInOnAppearingPageViewModel showPopupInOnAppearingPageViewModel,
+		IPopupService popupService)
 		: base(showPopupInOnAppearingPageViewModel)
 	{
 		InitializeComponent();
-		this.popupSizeConstants = popupSizeConstants;
+
+		this.popupService = popupService;
 	}
 
 	protected override async void OnAppearing()
 	{
-		var cts = new CancellationTokenSource(TimeSpan.FromSeconds(5));
-
-		// Proves that we now support showing a popup before the platform is even ready.
-		await this.ShowPopupAsync(new ReturnResultPopup(popupSizeConstants), cts.Token);
+		if (!hasPopupBeenShown)
+		{
+			hasPopupBeenShown = true;
+			await popupService.ShowPopupAsync<ReturnResultPopup, string>(Navigation);
+		}
 	}
 }
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Resources/Styles/Styles.xaml b/samples/CommunityToolkit.Maui.Sample/Resources/Styles/Styles.xaml
index 43b0bcf16b..a61dfe0a11 100644
--- a/samples/CommunityToolkit.Maui.Sample/Resources/Styles/Styles.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Resources/Styles/Styles.xaml
@@ -15,12 +15,6 @@
         <Setter Property="BackgroundColor" Value="{OnPlatform WinUI=Transparent, Default={AppThemeBinding Light={StaticResource AppBackgroundLightColor}, Dark={StaticResource AppBackgroundDarkColor}}}" />
     </Style>
 
-    <Style TargetType="toolkit:Popup" ApplyToDerivedTypes="true">
-        <Setter Property="VerticalOptions" Value="Center" />
-        <Setter Property="HorizontalOptions" Value="Center" />
-        <Setter Property="Color" Value="{AppThemeBinding Light={StaticResource AppBackgroundLightColor}, Dark={StaticResource AppBackgroundDarkColor}}" />
-    </Style>
-
     <Style TargetType="NavigationPage">
         <Setter Property="BarBackgroundColor" Value="{AppThemeBinding Light={StaticResource PrimaryColor}, Dark={StaticResource Gray950}}" />
         <Setter Property="BarTextColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource White}}" />
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/CsharpBindingPopupViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/CsharpBindingPopupViewModel.cs
index b012888288..de7f6cd813 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/CsharpBindingPopupViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/CsharpBindingPopupViewModel.cs
@@ -1,4 +1,5 @@
-using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Maui.Core;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace CommunityToolkit.Maui.Sample.ViewModels.Views;
 
@@ -10,8 +11,5 @@ public sealed partial class CsharpBindingPopupViewModel : BaseViewModel
 	[ObservableProperty]
 	public partial string Message { get; set; } = "This message uses a ViewModel binding";
 
-	internal void Load(string updatedMessage)
-	{
-		Message = updatedMessage;
-	}
+	public TaskCompletionSource<IPopupResult>? PopupResultManager { get; set; }
 }
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/CustomSizeAndPositionPopupViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/CustomSizeAndPositionPopupViewModel.cs
deleted file mode 100644
index 5ef956c7fd..0000000000
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/CustomSizeAndPositionPopupViewModel.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-using System.Runtime.CompilerServices;
-using CommunityToolkit.Maui.Sample.Views.Popups;
-using CommunityToolkit.Maui.Views;
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
-
-namespace CommunityToolkit.Maui.Sample.ViewModels.Views;
-
-public partial class CustomSizeAndPositionPopupViewModel : BaseViewModel
-{
-	public IReadOnlyList<string> FlowDirectionOptions { get; } = [.. Enum.GetNames<FlowDirection>()];
-
-	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(ExecuteShowButtonCommand))]
-	public partial double Height { get; set; } = 100;
-
-	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(ExecuteShowButtonCommand))]
-	public partial double Width { get; set; } = 100;
-
-	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(ExecuteShowButtonCommand))]
-	public partial bool IsStartHorizontalOptionSelected { get; set; } = true;
-
-	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(ExecuteShowButtonCommand))]
-	public partial bool IsCenterHorizontalOptionSelected { get; set; }
-
-	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(ExecuteShowButtonCommand))]
-	public partial bool IsEndHorizontalOptionSelected { get; set; }
-
-	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(ExecuteShowButtonCommand))]
-	public partial bool IsFillHorizontalOptionSelected { get; set; }
-
-	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(ExecuteShowButtonCommand))]
-	public partial bool IsStartVerticalOptionSelected { get; set; } = true;
-
-	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(ExecuteShowButtonCommand))]
-	public partial bool IsCenterVerticalOptionSelected { get; set; }
-
-	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(ExecuteShowButtonCommand))]
-	public partial bool IsEndVerticalOptionSelected { get; set; }
-
-	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(ExecuteShowButtonCommand))]
-	public partial bool IsFillVerticalOptionSelected { get; set; }
-
-	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(ExecuteShowButtonCommand))]
-	public partial int FlowDirectionSelectedIndex { get; set; }
-
-	[RelayCommand(CanExecute = nameof(CanShowButtonExecute))]
-	public Task ExecuteShowButton(CancellationToken token)
-	{
-		if (!IsFlowDirectionSelectionValid(FlowDirectionSelectedIndex, FlowDirectionOptions.Count))
-		{
-			throw new IndexOutOfRangeException("Invalid FlowDirection Selected");
-		}
-
-		Microsoft.Maui.Primitives.LayoutAlignment? verticalOptions = null, horizontalOptions = null;
-
-		if (IsStartVerticalOptionSelected)
-		{
-			verticalOptions = Microsoft.Maui.Primitives.LayoutAlignment.Start;
-		}
-		if (IsCenterVerticalOptionSelected)
-		{
-			verticalOptions = Microsoft.Maui.Primitives.LayoutAlignment.Center;
-		}
-		if (IsEndVerticalOptionSelected)
-		{
-			verticalOptions = Microsoft.Maui.Primitives.LayoutAlignment.End;
-		}
-		if (IsFillVerticalOptionSelected)
-		{
-			verticalOptions = Microsoft.Maui.Primitives.LayoutAlignment.Fill;
-		}
-
-		ArgumentNullException.ThrowIfNull(verticalOptions);
-
-		if (IsStartHorizontalOptionSelected)
-		{
-			horizontalOptions = Microsoft.Maui.Primitives.LayoutAlignment.Start;
-		}
-		if (IsCenterHorizontalOptionSelected)
-		{
-			horizontalOptions = Microsoft.Maui.Primitives.LayoutAlignment.Center;
-		}
-		if (IsEndHorizontalOptionSelected)
-		{
-			horizontalOptions = Microsoft.Maui.Primitives.LayoutAlignment.End;
-		}
-		if (IsFillHorizontalOptionSelected)
-		{
-			horizontalOptions = Microsoft.Maui.Primitives.LayoutAlignment.Fill;
-		}
-
-		ArgumentNullException.ThrowIfNull(horizontalOptions);
-
-		var popup = new FlowDirectionPopup((FlowDirection)FlowDirectionSelectedIndex)
-		{
-			Size = new Size(Width, Height),
-			VerticalOptions = verticalOptions.Value,
-			HorizontalOptions = horizontalOptions.Value
-		};
-
-		return Shell.Current.ShowPopupAsync(popup, token);
-	}
-
-	static bool IsFlowDirectionSelectionValid(int flowDirectionSelection, int flowDirectionOptionsCount)
-	{
-		return flowDirectionSelection < flowDirectionOptionsCount
-				&& flowDirectionSelection >= 0;
-	}
-
-	// Ensure at least one Horizontal Option is selected, one Vertical Option is selected, Height > 0, Width > 0, and FlowDirection is valid
-	bool CanShowButtonExecute() => (IsStartHorizontalOptionSelected || IsCenterHorizontalOptionSelected || IsEndHorizontalOptionSelected || IsFillHorizontalOptionSelected)
-		&& (IsStartVerticalOptionSelected || IsCenterVerticalOptionSelected || IsEndVerticalOptionSelected || IsFillVerticalOptionSelected)
-		&& Height > 0
-		&& Width > 0
-		&& IsFlowDirectionSelectionValid(FlowDirectionSelectedIndex, FlowDirectionOptions.Count);
-
-	partial class FlowDirectionPopup : RedBlueBoxPopup
-	{
-		readonly FlowDirection flowDirection;
-
-		public FlowDirectionPopup(FlowDirection flowDirection)
-		{
-			this.flowDirection = flowDirection;
-
-			if (Content is not null)
-			{
-				Content.FlowDirection = flowDirection;
-			}
-		}
-
-		protected override void OnPropertyChanged([CallerMemberName] string? propertyName = null)
-		{
-			base.OnPropertyChanged(propertyName);
-
-			if (propertyName == ContentProperty.PropertyName && Content is not null)
-			{
-				Content.FlowDirection = flowDirection;
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/MultiplePopupViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/MultiplePopupViewModel.cs
deleted file mode 100644
index 05dd13a531..0000000000
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/MultiplePopupViewModel.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using CommunityToolkit.Maui.Core;
-using CommunityToolkit.Mvvm.Input;
-
-namespace CommunityToolkit.Maui.Sample.ViewModels.Views;
-
-public partial class MultiplePopupViewModel(IPopupService popupService) : BaseViewModel
-{
-	[RelayCommand]
-	Task OnCsharpBindingPopup(CancellationToken token)
-	{
-		return popupService.ShowPopupAsync<CsharpBindingPopupViewModel>(
-			onPresenting: viewModel => viewModel.Load("This is a platform specific popup with a .NET MAUI View being rendered. The behaviors of the popup will confirm to 100% this platform look and feel, but still allows you to use your .NET MAUI Controls."),
-			token);
-	}
-
-	[RelayCommand]
-	Task OnUpdatingPopup(CancellationToken token)
-	{
-		return popupService.ShowPopupAsync<UpdatingPopupViewModel>(
-			onPresenting: viewModel => viewModel.PerformUpdates(10),
-			token);
-	}
-}
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/PopupAnchorViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/PopupAnchorViewModel.cs
deleted file mode 100644
index fcebff5c3e..0000000000
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/PopupAnchorViewModel.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using CommunityToolkit.Maui.Sample.Views.Popups;
-using CommunityToolkit.Maui.Views;
-using CommunityToolkit.Mvvm.Input;
-
-namespace CommunityToolkit.Maui.Sample.ViewModels.Views;
-
-public sealed partial class PopupAnchorViewModel : BaseViewModel
-{
-	static Page MainPage => Application.Current?.Windows[0].Page ?? throw new InvalidOperationException("MainPage cannot be null");
-
-	[RelayCommand]
-	static void ShowPopup(View anchor)
-	{
-		var popup = new TransparentPopupCSharp()
-		{
-			Anchor = anchor
-		};
-		MainPage.ShowPopup(popup);
-	}
-}
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/PopupContentViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/PopupContentViewModel.cs
new file mode 100644
index 0000000000..5af0d8e27c
--- /dev/null
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/PopupContentViewModel.cs
@@ -0,0 +1,11 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace CommunityToolkit.Maui.Sample.ViewModels.Views;
+
+public sealed partial class PopupContentViewModel : BaseViewModel
+{
+	[ObservableProperty]
+	public partial string Message { get; private set; } = "";
+
+	internal void SetMessage(string text) => this.Message = text;
+}
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/PopupPositionViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/PopupPositionViewModel.cs
index 88620a1477..ed01c80a86 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/PopupPositionViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/PopupPositionViewModel.cs
@@ -1,7 +1,7 @@
-using CommunityToolkit.Maui.Sample.Views.Popups;
+using CommunityToolkit.Maui.Extensions;
+using CommunityToolkit.Maui.Markup;
 using CommunityToolkit.Maui.Views;
 using CommunityToolkit.Mvvm.Input;
-using LayoutAlignment = Microsoft.Maui.Primitives.LayoutAlignment;
 
 namespace CommunityToolkit.Maui.Sample.ViewModels.Views;
 
@@ -10,53 +10,71 @@ public partial class PopupPositionViewModel : BaseViewModel
 	static Page Page => Application.Current?.Windows[0].Page ?? throw new InvalidOperationException("MainPage cannot be null");
 
 	[RelayCommand]
-	static void DisplayPopup(PopupPosition position)
+	void DisplayPopup(PopupPosition position)
 	{
-		// Using the C# version of Popup until this get fixed
-		// https://github.com/dotnet/maui/issues/4300
-		var popup = new TransparentPopupCSharp();
+		LayoutOptions verticalOptions, horizontalOptions;
 
 		switch (position)
 		{
 			case PopupPosition.TopLeft:
-				popup.VerticalOptions = LayoutAlignment.Start;
-				popup.HorizontalOptions = LayoutAlignment.Start;
+				verticalOptions = LayoutOptions.Start;
+				horizontalOptions = LayoutOptions.Start;
 				break;
+
 			case PopupPosition.Top:
-				popup.VerticalOptions = LayoutAlignment.Start;
-				popup.HorizontalOptions = LayoutAlignment.Center;
+				verticalOptions = LayoutOptions.Start;
+				horizontalOptions = LayoutOptions.Center;
 				break;
+
 			case PopupPosition.TopRight:
-				popup.VerticalOptions = LayoutAlignment.Start;
-				popup.HorizontalOptions = LayoutAlignment.End;
+				verticalOptions = LayoutOptions.Start;
+				horizontalOptions = LayoutOptions.End;
 				break;
+
 			case PopupPosition.Left:
-				popup.VerticalOptions = LayoutAlignment.Center;
-				popup.HorizontalOptions = LayoutAlignment.Start;
+				verticalOptions = LayoutOptions.Center;
+				horizontalOptions = LayoutOptions.Start;
 				break;
+
 			case PopupPosition.Center:
-				popup.VerticalOptions = LayoutAlignment.Center;
-				popup.HorizontalOptions = LayoutAlignment.Center;
+				verticalOptions = LayoutOptions.Center;
+				horizontalOptions = LayoutOptions.Center;
 				break;
+
 			case PopupPosition.Right:
-				popup.VerticalOptions = LayoutAlignment.Center;
-				popup.HorizontalOptions = LayoutAlignment.End;
+				verticalOptions = LayoutOptions.Center;
+				horizontalOptions = LayoutOptions.End;
 				break;
+
 			case PopupPosition.BottomLeft:
-				popup.VerticalOptions = LayoutAlignment.End;
-				popup.HorizontalOptions = LayoutAlignment.Start;
+				verticalOptions = LayoutOptions.End;
+				horizontalOptions = LayoutOptions.Start;
 				break;
+
 			case PopupPosition.Bottom:
-				popup.VerticalOptions = LayoutAlignment.End;
-				popup.HorizontalOptions = LayoutAlignment.Center;
+				verticalOptions = LayoutOptions.End;
+				horizontalOptions = LayoutOptions.Center;
 				break;
+
 			case PopupPosition.BottomRight:
-				popup.VerticalOptions = LayoutAlignment.End;
-				popup.HorizontalOptions = LayoutAlignment.End;
+				verticalOptions = LayoutOptions.End;
+				horizontalOptions = LayoutOptions.End;
 				break;
+
+			default:
+				throw new NotSupportedException($"{position} not yet supported");
 		}
 
-		Page.ShowPopup(popup);
+		Page.ShowPopup(new Popup
+		{
+			Content = new Label().Text("This Text Should Be Centered").Center().TextCenter(),
+			BackgroundColor = Colors.Green,
+			HeightRequest = 100,
+			WidthRequest = 100,
+			VerticalOptions = verticalOptions,
+			HorizontalOptions = horizontalOptions,
+			Padding = 0
+		});
 	}
 
 	public enum PopupPosition
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/PopupSizingIssuesViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/PopupSizingIssuesViewModel.cs
index 5f33239b86..6c54d836cb 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/PopupSizingIssuesViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/PopupSizingIssuesViewModel.cs
@@ -1,4 +1,6 @@
 using CommunityToolkit.Maui.Alerts;
+using CommunityToolkit.Maui.Extensions;
+using CommunityToolkit.Maui.Markup;
 using CommunityToolkit.Maui.Views;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
@@ -7,18 +9,6 @@ namespace CommunityToolkit.Maui.Sample.ViewModels.Views;
 
 public partial class PopupSizingIssuesViewModel : BaseViewModel
 {
-	[ObservableProperty]
-	public partial ContainerModel SelectedContainer { get; set; }
-
-	[ObservableProperty]
-	public partial int Padding { get; set; } = 6;
-
-	[ObservableProperty]
-	public partial int Adding { get; set; } = 6;
-
-	[ObservableProperty]
-	public partial int Margin { get; set; } = 12;
-
 	public PopupSizingIssuesViewModel()
 	{
 		SelectedContainer = Containers[0];
@@ -33,49 +23,70 @@ public PopupSizingIssuesViewModel()
 		new("CollectionView", new ControlTemplate(() => new CollectionView()))
 	];
 
+	[ObservableProperty]
+	public partial ContainerModel SelectedContainer { get; set; }
+
+	[ObservableProperty]
+	public partial int Padding { get; set; } = 6;
+
+	[ObservableProperty]
+	public partial int Margin { get; set; } = 12;
+
 	[RelayCommand]
-	async Task OnShowPopup(Page page)
+	async Task OnShowPopup()
 	{
 		var popup = new Popup();
 
-		if (SelectedContainer?.ControlTemplate.LoadTemplate() is not (View container and ContentView contentView))
+		if (SelectedContainer.ControlTemplate.LoadTemplate() is not View view)
 		{
 			await Toast.Make("Invalid Container Selected").Show();
 			return;
 		}
 
-		container.SetValue(Layout.PaddingProperty, new Thickness(Padding));
-		container.SetValue(View.MarginProperty, new Thickness(Margin));
+		view.SetValue(View.MarginProperty, new Thickness(Margin));
 
 		const string longText = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
-		contentView.Content = GetContentLabel(longText);
 
-		if (container is Layout layout)
+		switch (view)
 		{
-			layout.Children.Add(GetContentLabel(longText));
+			case Layout layout:
+				layout.Children.Add(GetContentLabel(longText));
+				layout.SetValue(Layout.PaddingProperty, new Thickness(Padding));
+				break;
+
+			case ItemsView itemsView:
+				itemsView.ItemsSource = Enumerable.Repeat(longText, 10);
+				itemsView.ItemTemplate = new DataTemplate(() => GetContentLabel(longText));
+				break;
+
+			case Border border:
+				border.Content = GetContentLabel(longText);
+				break;
+
+			default:
+				throw new NotSupportedException($"{view.GetType().FullName} is not yet supported");
 		}
-		else if (container is ItemsView itemsView)
+
+		popup.Content = view;
+		popup.Margin = Margin;
+		popup.Padding = Padding;
+
+		if (Application.Current?.Windows[0] is not { Page: not null } window)
 		{
-			itemsView.ItemsSource = Enumerable.Repeat(longText, 10);
-			itemsView.ItemTemplate = new DataTemplate(() => GetContentLabel(longText));
+			throw new InvalidOperationException("Unable to find page");
 		}
 
-		popup.Content = container;
-
-		page.ShowPopup(popup);
+		window.Page.ShowPopup(popup);
 	}
 
-	static Label GetContentLabel(in string text) => new()
-	{
-		Text = text,
-		HorizontalOptions = LayoutOptions.Center,
-		VerticalOptions = LayoutOptions.Center
-	};
+	static Label GetContentLabel(in string text) => new Label { LineBreakMode = LineBreakMode.WordWrap }.Text(text, Colors.Black).Center();
 }
 
-public partial class ContainerModel(string name, ControlTemplate controlTemplate) : ObservableObject
+public partial class ContainerModel(in string name, in ControlTemplate controlTemplate) : ObservableObject
 {
 	public string Name { get; } = name;
 
 	public ControlTemplate ControlTemplate { get; } = controlTemplate;
+
+	public override string ToString() => Name;
 }
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/PopupsViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/PopupsViewModel.cs
new file mode 100644
index 0000000000..14c1cb9f6f
--- /dev/null
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/PopupsViewModel.cs
@@ -0,0 +1,26 @@
+using CommunityToolkit.Mvvm.Input;
+
+namespace CommunityToolkit.Maui.Sample.ViewModels.Views;
+
+public partial class PopupsViewModel(IPopupService popupService) : BaseViewModel
+{
+	static INavigation currentNavigation => Application.Current?.Windows[0].Page?.Navigation ?? throw new InvalidOperationException($"{nameof(Page.Navigation)} not found");
+
+	[RelayCommand]
+	void OnCsharpBindingPopup()
+	{
+		popupService.ShowPopup<CsharpBindingPopupViewModel>(currentNavigation);
+	}
+
+	[RelayCommand]
+	void OnUpdatingPopup()
+	{
+		popupService.ShowPopup<UpdatingPopupViewModel>(currentNavigation);
+	}
+
+	[RelayCommand]
+	Task OnShowPopupContent(CancellationToken token)
+	{
+		return popupService.ShowPopupAsync<PopupContentViewModel>(currentNavigation, cancellationToken: token);
+	}
+}
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/StylePopupViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/StylePopupViewModel.cs
index 592b5cdc62..0ea5b98ed3 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/StylePopupViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/StylePopupViewModel.cs
@@ -1,6 +1,7 @@
-using CommunityToolkit.Maui.Sample.Views.Popups;
-using CommunityToolkit.Maui.Views;
+using CommunityToolkit.Maui.Extensions;
+using CommunityToolkit.Maui.Sample.Views.Popups;
 using CommunityToolkit.Mvvm.Input;
+using Microsoft.Maui.Controls.Shapes;
 
 namespace CommunityToolkit.Maui.Sample.ViewModels.Views;
 
@@ -9,51 +10,51 @@ public partial class StylePopupViewModel : BaseViewModel
 	static Page MainPage => Shell.Current;
 
 	[RelayCommand]
-	static void DisplayImplicitStylePopup()
+	static async Task DisplayImplicitStylePopup()
 	{
 		var popup = new ImplicitStylePopup();
-		MainPage.ShowPopup(popup);
+		await MainPage.ShowPopupAsync(popup);
 	}
 
 	[RelayCommand]
-	static void DisplayExplicitStylePopup()
+	static async Task DisplayExplicitStylePopup()
 	{
 		var popup = new ExplicitStylePopup();
-		MainPage.ShowPopup(popup);
+		await MainPage.ShowPopupAsync(popup, PopupOptions.Empty);
 	}
 
 	[RelayCommand]
-	static void DisplayDynamicStylePopup()
+	static async Task DisplayDynamicStylePopup()
 	{
 		var popup = new DynamicStylePopup();
-		MainPage.ShowPopup(popup);
+		await MainPage.ShowPopupAsync(popup, PopupOptions.Empty);
 	}
 
 	[RelayCommand]
-	static void DisplayApplyToDerivedTypesPopup()
+	static async Task DisplayApplyToDerivedTypesPopup()
 	{
 		var popup = new ApplyToDerivedTypesPopup();
-		MainPage.ShowPopup(popup);
+		await MainPage.Navigation.ShowPopupAsync(popup, PopupOptions.Empty);
 	}
 
 	[RelayCommand]
-	static void DisplayStyleInheritancePopup()
+	static async Task DisplayStyleInheritancePopup()
 	{
 		var popup = new StyleInheritancePopup();
-		MainPage.ShowPopup(popup);
+		await MainPage.ShowPopupAsync(popup, PopupOptions.Empty);
 	}
 
 	[RelayCommand]
-	static void DisplayDynamicStyleInheritancePopup()
+	static async Task DisplayDynamicStyleInheritancePopup()
 	{
 		var popup = new DynamicStyleInheritancePopup();
-		MainPage.ShowPopup(popup);
+		await MainPage.ShowPopupAsync(popup, PopupOptions.Empty);
 	}
 
 	[RelayCommand]
-	static void DisplayStyleClassPopup()
+	static async Task DisplayStyleClassPopup()
 	{
 		var popup = new StyleClassPopup();
-		MainPage.ShowPopup(popup);
+		await MainPage.ShowPopupAsync(popup, PopupOptions.Empty);
 	}
 }
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/UpdatingPopupViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/UpdatingPopupViewModel.cs
index e8f5a9a593..28c366c597 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/UpdatingPopupViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/UpdatingPopupViewModel.cs
@@ -1,5 +1,4 @@
-using CommunityToolkit.Maui.Core;
-using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 
 namespace CommunityToolkit.Maui.Sample.ViewModels.Views;
@@ -7,9 +6,6 @@ namespace CommunityToolkit.Maui.Sample.ViewModels.Views;
 public partial class UpdatingPopupViewModel(IPopupService popupService) : BaseViewModel
 {
 	const double finalUpdateProgressValue = 1;
-	readonly IPopupService popupService = popupService;
-
-	int updates;
 
 	[ObservableProperty]
 	public partial string Message { get; set; } = "";
@@ -21,7 +17,6 @@ public partial class UpdatingPopupViewModel(IPopupService popupService) : BaseVi
 	internal async void PerformUpdates(int numberOfUpdates)
 	{
 		double updateTotalForPercentage = numberOfUpdates + 1;
-		updates = numberOfUpdates;
 
 		for (var update = 1; update <= numberOfUpdates; update++)
 		{
@@ -37,15 +32,25 @@ internal async void PerformUpdates(int numberOfUpdates)
 	}
 
 	[RelayCommand(CanExecute = nameof(CanFinish))]
-	void OnFinish()
+	async Task OnFinish()
 	{
-		popupService.ClosePopup();
+		if (Application.Current?.Windows[0].Page is not Page currentPage)
+		{
+			throw new InvalidOperationException("Unable to retrieve current page");
+		}
+
+		await popupService.ClosePopupAsync(currentPage.Navigation);
 	}
 
 	[RelayCommand]
-	void OnMore()
+	async Task OnMore()
 	{
-		popupService.ShowPopup<UpdatingPopupViewModel>(onPresenting: viewModel => viewModel.PerformUpdates(updates + 2));
+		if (Application.Current?.Windows[0].Page is not Page currentPage)
+		{
+			throw new InvalidOperationException("Unable to retrieve current page");
+		}
+
+		await popupService.ShowPopupAsync<UpdatingPopupViewModel>(currentPage.Navigation);
 	}
 
 	bool CanFinish() => UpdateProgress is finalUpdateProgressValue;
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/ViewsGalleryViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/ViewsGalleryViewModel.cs
index 92614c5d55..ea038112a0 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/ViewsGalleryViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/ViewsGalleryViewModel.cs
@@ -1,5 +1,4 @@
 using CommunityToolkit.Maui.Sample.Models;
-using CommunityToolkit.Maui.Sample.ViewModels.Views;
 
 namespace CommunityToolkit.Maui.Sample.ViewModels.Views;
 
@@ -17,7 +16,6 @@ public sealed partial class ViewsGalleryViewModel() : BaseGalleryViewModel(
 	SectionModel.Create<AvatarViewShapesViewModel>("AvatarView Shapes Page", Colors.Red, "A page demonstrating AvatarViews with various shape options."),
 	SectionModel.Create<AvatarViewSizesViewModel>("AvatarView Sizes Page", Colors.Red, "A page demonstrating AvatarViews with various size options."),
 	SectionModel.Create<CameraViewViewModel>("CameraView Page", Colors.Red, "CameraView is a view for displaying camera output."),
-	SectionModel.Create<CustomSizeAndPositionPopupViewModel>("Custom Size and Positioning Popup", Colors.Red, "Displays a basic popup anywhere on the screen with a custom size using VerticalOptions and HorizontalOptions."),
 	SectionModel.Create<DrawingViewViewModel>("DrawingView", Colors.Red, "DrawingView provides a canvas for users to \"paint\" on the screen. The drawing can also be captured and displayed as an Image."),
 	SectionModel.Create<ExpanderViewModel>("Expander Page", Colors.Red, "Expander allows collapse and expand content."),
 	SectionModel.Create<BasicMapsViewModel>("Maps Basic Page", Colors.Red, "A page demonstrating a basic example of .NET MAUI Maps"),
@@ -27,15 +25,9 @@ public sealed partial class ViewsGalleryViewModel() : BaseGalleryViewModel(
 	SectionModel.Create<MediaElementCarouselViewViewModel>("MediaElement in CarouselView", Colors.Red, "MediaElement can be used inside a DataTemplate in a CarouselView"),
 	SectionModel.Create<MediaElementCollectionViewViewModel>("MediaElement in CollectionView", Colors.Red, "MediaElement can be used inside a DataTemplate in a CollectionView"),
 	SectionModel.Create<MediaElementMultipleWindowsViewModel>("MediaElement in a Multi-Window Application", Colors.Red, "Demonstrates that MediaElement can be used inside a DataTemplate simultaneously on multiple windows"),
-	SectionModel.Create<MultiplePopupViewModel>("Multiple Popups Page", Colors.Red, "A page demonstrating multiple different Popups"),
-	SectionModel.Create<PopupPositionViewModel>("Custom Positioning Popup", Colors.Red, "Displays a basic popup anywhere on the screen using VerticalOptions and HorizontalOptions"),
-	SectionModel.Create<PopupAnchorViewModel>("Anchor Popup", Colors.Red, "Popups can be anchored to other view's on the screen"),
-	SectionModel.Create<PopupLayoutAlignmentViewModel>("Popup Layout Page", Colors.Red, "Popup.Content demonstrated using different layouts"),
-	SectionModel.Create<PopupSizingIssuesViewModel>("Popup Sizing Issues Page", Colors.Red, "A page demonstrating how Popups can be styled in a .NET MAUI application."),
 	SectionModel.Create<RatingViewShowcaseViewModel>("RatingView Showcase Page", Colors.Red, "A page with showcase examples for the RatingView control."),
 	SectionModel.Create<RatingViewXamlViewModel>("RatingView XAML Page", Colors.Red, "A page demonstrating the RatingView control and possible uses using XAML"),
 	SectionModel.Create<RatingViewCsharpViewModel>("RatingView C# Page", Colors.Red, "A page demonstrating the RatingView control and possible uses using C#"),
-	SectionModel.Create<ShowPopupInOnAppearingPageViewModel>("Show Popup in OnAppearing", Colors.Red, "Proves that we now support showing a popup before the platform is even ready."),
 	SectionModel.Create<SemanticOrderViewPageViewModel>("Semantic Order View", Colors.Red, "SemanticOrderView allows developers to indicate the focus order of visible controls when a user is navigating via TalkBack (Android), VoiceOver (iOS) or Narrator (Windows)."),
-	SectionModel.Create<StylePopupViewModel>("Popup Style Page", Colors.Red, "A page demonstrating how Popups can be styled in a .NET MAUI application.")
+	SectionModel.Create<PopupsViewModel>("Popups Page", Colors.Red, "A page demonstrating multiple different Popups")
 ]);
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/ApplyToDerivedTypesPopup.xaml b/samples/CommunityToolkit.Maui.Sample/Views/Popups/ApplyToDerivedTypesPopup.xaml
index ddc2968361..3ccdeabe4b 100644
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/ApplyToDerivedTypesPopup.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/ApplyToDerivedTypesPopup.xaml
@@ -3,15 +3,13 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
              x:Class="CommunityToolkit.Maui.Sample.Views.Popups.ApplyToDerivedTypesPopup">
-    <mct:Popup.Resources>
-        <Style TargetType="{x:Type mct:Popup}" ApplyToDerivedTypes="True">
-            <Setter Property="Size" Value="150,150" />
-            <Setter Property="Color" Value="Orange" />
-            <Setter Property="HorizontalOptions" Value="End" />
-            <Setter Property="VerticalOptions" Value="Center" />
-            <Setter Property="CanBeDismissedByTappingOutsideOfPopup" Value="True" />
+    <ContentView.Resources>
+        <Style TargetType="{x:Type ContentView}" ApplyToDerivedTypes="True">
+            <Setter Property="WidthRequest" Value="150" />
+            <Setter Property="HeightRequest" Value="150" />
+            <Setter Property="BackgroundColor" Value="Orange" />
         </Style>
-    </mct:Popup.Resources>
+    </ContentView.Resources>
     
     <Grid VerticalOptions="Fill" HorizontalOptions="Fill" BackgroundColor="Transparent" Style="{StaticResource PopupLayout}">
         <Grid WidthRequest="10" HeightRequest="10" VerticalOptions="Start" HorizontalOptions="Start" BackgroundColor="Blue" />
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/ApplyToDerivedTypesPopup.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Views/Popups/ApplyToDerivedTypesPopup.xaml.cs
index f8093fc0e8..afc4dd5f2a 100644
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/ApplyToDerivedTypesPopup.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/ApplyToDerivedTypesPopup.xaml.cs
@@ -1,12 +1,10 @@
-using CommunityToolkit.Maui.Views;
-
-namespace CommunityToolkit.Maui.Sample.Views.Popups;
+namespace CommunityToolkit.Maui.Sample.Views.Popups;
 
 /// <summary>
 /// This popup demonstrates how the ApplyToDerivedTypes property can allow for Popup implementations
 /// that inherit from Popup to still use a common Style definition.
 /// </summary>
-public partial class ApplyToDerivedTypesPopup : Popup
+public partial class ApplyToDerivedTypesPopup
 {
 	public ApplyToDerivedTypesPopup()
 	{
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/ButtonPopup.xaml b/samples/CommunityToolkit.Maui.Sample/Views/Popups/ButtonPopup.xaml
index 1c297f9b88..efbfb5d064 100644
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/ButtonPopup.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/ButtonPopup.xaml
@@ -3,9 +3,11 @@
 	x:Class="CommunityToolkit.Maui.Sample.Views.Popups.ButtonPopup"
 	xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
 	xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-	xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit">
+	xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
+    BackgroundColor="Red">
 
-	<VerticalStackLayout Style="{StaticResource PopupLayout}">
+	<VerticalStackLayout Style="{StaticResource PopupLayout}"
+                         Spacing="12">
 		<VerticalStackLayout.Resources>
 			<ResourceDictionary>
 				<Style x:Key="Title" TargetType="Label">
@@ -25,7 +27,7 @@
 					<Setter Property="VerticalTextAlignment" Value="Center" />
 				</Style>
 				<Style x:Key="ConfirmButton" TargetType="Button">
-					<Setter Property="VerticalOptions" Value="EndAndExpand" />
+					<Setter Property="VerticalOptions" Value="End" />
 				</Style>
 			</ResourceDictionary>
 		</VerticalStackLayout.Resources>
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/ButtonPopup.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Views/Popups/ButtonPopup.xaml.cs
index 28700388a5..28972839ba 100644
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/ButtonPopup.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/ButtonPopup.xaml.cs
@@ -1,19 +1,14 @@
-using CommunityToolkit.Maui.Sample.Models;
-using CommunityToolkit.Maui.Views;
-
 namespace CommunityToolkit.Maui.Sample.Views.Popups;
 
-public partial class ButtonPopup : Popup
+public partial class ButtonPopup : Maui.Views.Popup
 {
-	public ButtonPopup(PopupSizeConstants popupSizeConstants)
+	public ButtonPopup()
 	{
 		InitializeComponent();
-		Size = popupSizeConstants.Medium;
 	}
 
-	async void Button_Clicked(object? sender, EventArgs e)
+	void Button_Clicked(object? sender, EventArgs e)
 	{
-		var cts = new CancellationTokenSource(TimeSpan.FromSeconds(5));
-		await CloseAsync(token: cts.Token);
+		Close();
 	}
 }
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/CsharpBindingPopup.cs b/samples/CommunityToolkit.Maui.Sample/Views/Popups/CsharpBindingPopup.cs
new file mode 100644
index 0000000000..a943e5a9f9
--- /dev/null
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/CsharpBindingPopup.cs
@@ -0,0 +1,40 @@
+using CommunityToolkit.Maui.Markup;
+using CommunityToolkit.Maui.Sample.ViewModels.Views;
+using CommunityToolkit.Maui.Views;
+
+namespace CommunityToolkit.Maui.Sample.Views.Popups;
+
+public partial class CsharpBindingPopup : Popup
+{
+	public CsharpBindingPopup(CsharpBindingPopupViewModel csharpBindingPopupViewModel)
+	{
+		BindingContext = csharpBindingPopupViewModel;
+
+		Content = new VerticalStackLayout
+		{
+			Children =
+			{
+				new Label()
+					.Font(size: 26, bold: true)
+					.TextColor(Colors.Black)
+					.TextCenter()
+					.Top().Center()
+					.Bind(Label.TextProperty,
+						getter: static (CsharpBindingPopupViewModel vm) => vm.Title),
+
+				new BoxView()
+					.Height(1)
+					.Margin(50, 25)
+					.BackgroundColor(Color.FromArgb("#c3c3c3")),
+
+				new Label()
+					.Center()
+					.TextCenter()
+					.TextColor(Colors.Black)
+					.Bind(Label.TextProperty,
+						getter: static (CsharpBindingPopupViewModel vm) => vm.Message)
+
+			}
+		};
+	}
+}
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/CsharpBindingPopup.xaml b/samples/CommunityToolkit.Maui.Sample/Views/Popups/CsharpBindingPopup.xaml
deleted file mode 100644
index 6e68d0ab17..0000000000
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/CsharpBindingPopup.xaml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<mct:Popup xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-           xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-           x:Class="CommunityToolkit.Maui.Sample.Views.Popups.CsharpBindingPopup"
-           xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
-           xmlns:vm="clr-namespace:CommunityToolkit.Maui.Sample.ViewModels.Views"
-           x:DataType="vm:CsharpBindingPopupViewModel">    
-    
-    <VerticalStackLayout Style="{StaticResource PopupLayout}">
-        <VerticalStackLayout.Resources>
-            <ResourceDictionary>
-                <Style x:Key="Title" TargetType="Label">
-                    <Setter Property="FontSize" Value="26" />
-                    <Setter Property="FontAttributes" Value="Bold" />
-                    <Setter Property="TextColor" Value="#000" />
-                    <Setter Property="VerticalTextAlignment" Value="Center" />
-                    <Setter Property="HorizontalTextAlignment" Value="Center" />
-                </Style>
-                <Style x:Key="Divider" TargetType="BoxView">
-                    <Setter Property="HeightRequest" Value="1" />
-                    <Setter Property="Margin" Value="50, 25" />
-                    <Setter Property="Color" Value="#c3c3c3" />
-                </Style>
-                <Style x:Key="Content" TargetType="Label">
-                    <Setter Property="HorizontalTextAlignment" Value="Start" />
-                    <Setter Property="VerticalTextAlignment" Value="Center" />
-                </Style>
-            </ResourceDictionary>
-        </VerticalStackLayout.Resources>
-
-        <Label Style="{StaticResource Title}" 
-               Text="{Binding Title}" />
-        <BoxView Style="{StaticResource Divider}" />
-        <Label Style="{StaticResource Content}" 
-               HorizontalOptions="Center"
-               VerticalOptions="Center"
-               HorizontalTextAlignment="Center"
-               VerticalTextAlignment="Center"
-               Text="{Binding Message}" />
-    </VerticalStackLayout>
-</mct:Popup>
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/CsharpBindingPopup.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Views/Popups/CsharpBindingPopup.xaml.cs
deleted file mode 100644
index 1a9f62337a..0000000000
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/CsharpBindingPopup.xaml.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using CommunityToolkit.Maui.Sample.Models;
-using CommunityToolkit.Maui.Sample.ViewModels.Views;
-using CommunityToolkit.Maui.Views;
-
-namespace CommunityToolkit.Maui.Sample.Views.Popups;
-
-public partial class CsharpBindingPopup : Popup
-{
-	public CsharpBindingPopup(PopupSizeConstants popupSizeConstants, CsharpBindingPopupViewModel csharpBindingPopupViewModel)
-	{
-		InitializeComponent();
-		BindingContext = csharpBindingPopupViewModel;
-
-		Size = popupSizeConstants.Large;
-	}
-}
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/DynamicStyleInheritancePopup.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Views/Popups/DynamicStyleInheritancePopup.xaml.cs
index f5ce631f55..7f4583bea7 100644
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/DynamicStyleInheritancePopup.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/DynamicStyleInheritancePopup.xaml.cs
@@ -1,8 +1,6 @@
-using CommunityToolkit.Maui.Views;
+namespace CommunityToolkit.Maui.Sample.Views.Popups;
 
-namespace CommunityToolkit.Maui.Sample.Views.Popups;
-
-public partial class DynamicStyleInheritancePopup : Popup
+public partial class DynamicStyleInheritancePopup
 {
 	public DynamicStyleInheritancePopup()
 	{
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/DynamicStylePopup.xaml b/samples/CommunityToolkit.Maui.Sample/Views/Popups/DynamicStylePopup.xaml
index dc1dcd6472..c1fb24234e 100644
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/DynamicStylePopup.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/DynamicStylePopup.xaml
@@ -7,11 +7,9 @@
            Style="{DynamicResource DynamicPopupStyle}">
     <mct:Popup.Resources>
         <Style TargetType="{x:Type popups:DynamicStylePopup}">
-            <Setter Property="Size" Value="100,200" />
-            <Setter Property="Color" Value="Green" />
-            <Setter Property="HorizontalOptions" Value="Center" />
-            <Setter Property="VerticalOptions" Value="Start" />
-            <Setter Property="CanBeDismissedByTappingOutsideOfPopup" Value="True" />
+            <Setter Property="WidthRequest" Value="100" />
+            <Setter Property="HeightRequest" Value="200" />
+            <Setter Property="BackgroundColor" Value="Green" />
         </Style>
     </mct:Popup.Resources>
     
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/DynamicStylePopup.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Views/Popups/DynamicStylePopup.xaml.cs
index d8b014820a..6d4ce06a99 100644
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/DynamicStylePopup.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/DynamicStylePopup.xaml.cs
@@ -3,10 +3,9 @@
 namespace CommunityToolkit.Maui.Sample.Views.Popups;
 
 /// <summary>
-/// This popup demonstrates how a <see cref="Style"/> is applied to a <see cref="Popup"/>
-/// through the use of the <see cref="Popup.Style"/> property using the <see cref="DynamicResourceExtension"/>.
+/// This popup demonstrates how a <see cref="Style"/> is applied to a <see cref="Popup"/>.
 /// </summary>
-public partial class DynamicStylePopup : Popup
+public partial class DynamicStylePopup
 {
 	public DynamicStylePopup()
 	{
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/ExplicitStylePopup.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Views/Popups/ExplicitStylePopup.xaml.cs
index 91e96df9a5..6a764be277 100644
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/ExplicitStylePopup.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/ExplicitStylePopup.xaml.cs
@@ -3,10 +3,9 @@
 namespace CommunityToolkit.Maui.Sample.Views.Popups;
 
 /// <summary>
-/// This popup demonstrates how a <see cref="Style"/> is applied to a <see cref="Popup"/> explicitly
-/// through the use of the <see cref="Popup.Style"/> property using the <see cref="StaticResourceExtension"/>.
+/// This popup demonstrates how a <see cref="Style"/> is applied to a <see cref="Popup"/> explicitly.
 /// </summary>
-public partial class ExplicitStylePopup : Popup
+public partial class ExplicitStylePopup
 {
 	public ExplicitStylePopup()
 	{
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/MultipleButtonPopup.xaml b/samples/CommunityToolkit.Maui.Sample/Views/Popups/MultipleButtonPopup.xaml
index 78a167106f..c3ec2dd626 100644
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/MultipleButtonPopup.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/MultipleButtonPopup.xaml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <mct:Popup
-	x:Class="CommunityToolkit.Maui.Sample.Views.Popups.MultipleButtonPopup"
+    x:TypeArguments="system:Boolean"
+    x:Class="CommunityToolkit.Maui.Sample.Views.Popups.MultipleButtonPopup"
 	xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
 	xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-	xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit">
+	xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
+	xmlns:system="clr-namespace:System;assembly=System.Runtime"
+    BackgroundColor="White">
 
-	<VerticalStackLayout Style="{StaticResource PopupLayout}">
+	<VerticalStackLayout Style="{StaticResource PopupLayout}"
+                         Spacing="12">
 		<VerticalStackLayout.Resources>
 			<ResourceDictionary>
 				<Style x:Key="Title" TargetType="Label">
@@ -31,8 +35,8 @@
 					<Setter Property="TextColor" Value="Blue" />
 				</Style>
 				<Style x:Key="ButtonGroup" TargetType="HorizontalStackLayout">
-					<Setter Property="VerticalOptions" Value="EndAndExpand" />
-					<Setter Property="HorizontalOptions" Value="CenterAndExpand" />
+					<Setter Property="VerticalOptions" Value="End" />
+					<Setter Property="HorizontalOptions" Value="Center" />
 					<Setter Property="Spacing" Value="20" />
 				</Style>
 			</ResourceDictionary>
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/MultipleButtonPopup.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Views/Popups/MultipleButtonPopup.xaml.cs
index 527aa6e02e..1406b4da52 100644
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/MultipleButtonPopup.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/MultipleButtonPopup.xaml.cs
@@ -1,26 +1,19 @@
-using CommunityToolkit.Maui.Sample.Models;
-using CommunityToolkit.Maui.Views;
-
 namespace CommunityToolkit.Maui.Sample.Views.Popups;
 
-public partial class MultipleButtonPopup : Popup
+public partial class MultipleButtonPopup : Maui.Views.Popup<bool>
 {
-	public MultipleButtonPopup(PopupSizeConstants popupSizeConstants)
+	public MultipleButtonPopup()
 	{
 		InitializeComponent();
-
-		Size = popupSizeConstants.Medium;
 	}
 
 	async void Cancel_Clicked(object? sender, EventArgs e)
 	{
-		var cts = new CancellationTokenSource(TimeSpan.FromSeconds(5));
-		await CloseAsync(false, cts.Token);
+		await Close(false);
 	}
 
 	async void Okay_Clicked(object? sender, EventArgs e)
 	{
-		var cts = new CancellationTokenSource(TimeSpan.FromSeconds(5));
-		await CloseAsync(true, cts.Token);
+		await Close(true);
 	}
 }
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/NoOutsideTapDismissPopup.xaml b/samples/CommunityToolkit.Maui.Sample/Views/Popups/NoOutsideTapDismissPopup.xaml
index 037959d562..8d913140fd 100644
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/NoOutsideTapDismissPopup.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/NoOutsideTapDismissPopup.xaml
@@ -4,9 +4,10 @@
 	xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
 	xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
 	xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
-	CanBeDismissedByTappingOutsideOfPopup="False">
+    BackgroundColor="White">
 
-	<VerticalStackLayout Style="{StaticResource PopupLayout}">
+	<VerticalStackLayout Style="{StaticResource PopupLayout}"
+                         Spacing="12">
 		<VerticalStackLayout.Resources>
 			<ResourceDictionary>
 				<Style x:Key="Title" TargetType="Label">
@@ -34,6 +35,6 @@
 		<Button
 			Clicked="Button_Clicked"
 			Text="Close"
-			VerticalOptions="EndAndExpand" />
+			VerticalOptions="End" />
 	</VerticalStackLayout>
 </mct:Popup>
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/NoOutsideTapDismissPopup.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Views/Popups/NoOutsideTapDismissPopup.xaml.cs
index b9c252ccad..10bc6a2a3b 100644
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/NoOutsideTapDismissPopup.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/NoOutsideTapDismissPopup.xaml.cs
@@ -1,23 +1,17 @@
 using CommunityToolkit.Maui.Alerts;
-using CommunityToolkit.Maui.Sample.Models;
-using CommunityToolkit.Maui.Views;
 
 namespace CommunityToolkit.Maui.Sample.Views.Popups;
 
-public partial class NoOutsideTapDismissPopup : Popup
+public partial class NoOutsideTapDismissPopup : Maui.Views.Popup
 {
-	public NoOutsideTapDismissPopup(PopupSizeConstants popupSizeConstants)
+	public NoOutsideTapDismissPopup()
 	{
 		InitializeComponent();
-
-		Size = popupSizeConstants.Medium;
 	}
 
 	async void Button_Clicked(object? sender, EventArgs e)
 	{
-		var cts = new CancellationTokenSource(TimeSpan.FromSeconds(5));
-
-		await CloseAsync(token: cts.Token);
-		await Toast.Make("Popup Dismissed By Button").Show(cts.Token);
+		await Close();
+		await Toast.Make("Popup Dismissed By Button").Show();
 	}
 }
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/OpenedEventSimplePopup.xaml b/samples/CommunityToolkit.Maui.Sample/Views/Popups/OpenedEventSimplePopup.xaml
index 0097c1e6a9..91179d7664 100644
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/OpenedEventSimplePopup.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/OpenedEventSimplePopup.xaml
@@ -2,9 +2,11 @@
 <mct:Popup xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="CommunityToolkit.Maui.Sample.Views.Popups.OpenedEventSimplePopup"
-             xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit">
+             xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
+             BackgroundColor="White">
 
-    <VerticalStackLayout Style="{StaticResource PopupLayout}">
+    <VerticalStackLayout Style="{StaticResource PopupLayout}"
+                         Spacing="12">
         <VerticalStackLayout.Resources>
             <ResourceDictionary>
                 <Style x:Key="Title" TargetType="Label">
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/OpenedEventSimplePopup.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Views/Popups/OpenedEventSimplePopup.xaml.cs
index d6b23fddda..52c6c22cda 100644
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/OpenedEventSimplePopup.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/OpenedEventSimplePopup.xaml.cs
@@ -1,26 +1,16 @@
-using CommunityToolkit.Maui.Core;
-using CommunityToolkit.Maui.Sample.Models;
-using CommunityToolkit.Maui.Views;
-
 namespace CommunityToolkit.Maui.Sample.Views.Popups;
 
-public partial class OpenedEventSimplePopup : Popup
+public partial class OpenedEventSimplePopup
 {
-	public OpenedEventSimplePopup(PopupSizeConstants popupSizeConstants)
+	public OpenedEventSimplePopup()
 	{
 		InitializeComponent();
+		Opened += async (s, e) =>
+		{
+			await Task.Delay(TimeSpan.FromSeconds(1));
 
-		Size = popupSizeConstants.Medium;
-		Opened += OnOpened;
-	}
-
-	async void OnOpened(object? sender, PopupOpenedEventArgs e)
-	{
-		Opened -= OnOpened;
-
-		await Task.Delay(TimeSpan.FromSeconds(1));
-
-		Title.Text = "Opened Event Popup";
-		Message.Text = "The content of this popup was updated after the popup was rendered";
+			Title.Text = "Opened Event Popup";
+			Message.Text = "The content of this popup was updated after the popup was rendered";
+		};
 	}
 }
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/PopupContentView.xaml b/samples/CommunityToolkit.Maui.Sample/Views/Popups/PopupContentView.xaml
new file mode 100644
index 0000000000..3743798142
--- /dev/null
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/PopupContentView.xaml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<toolkit:Popup
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    x:Class="CommunityToolkit.Maui.Sample.Views.Popups.PopupContentView"
+    xmlns:viewModels="clr-namespace:CommunityToolkit.Maui.Sample.ViewModels.Views"
+    xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
+    BackgroundColor="White"
+    x:DataType="viewModels:PopupContentViewModel">
+
+    <Label
+        Text="{Binding Message}"
+        HorizontalTextAlignment="Center"
+        VerticalTextAlignment="Center"
+        TextColor="Black"
+        Margin="20" />
+
+</toolkit:Popup>
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/PopupContentView.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Views/Popups/PopupContentView.xaml.cs
new file mode 100644
index 0000000000..f9baa99ca0
--- /dev/null
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/PopupContentView.xaml.cs
@@ -0,0 +1,18 @@
+using CommunityToolkit.Maui.Sample.ViewModels.Views;
+using CommunityToolkit.Maui.Views;
+
+namespace CommunityToolkit.Maui.Sample.Views.Popups;
+
+public partial class PopupContentView : Popup
+{
+	public PopupContentView(PopupContentViewModel popupContentViewModel)
+	{
+		InitializeComponent();
+
+		BindingContext = popupContentViewModel;
+
+		Opened += (s, e) =>
+			popupContentViewModel.SetMessage(
+				"This is a dynamically set message, shown in a popup without the need to create your own Popup subclass.");
+	}
+}
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/ReturnResultPopup.xaml b/samples/CommunityToolkit.Maui.Sample/Views/Popups/ReturnResultPopup.xaml
index 22ce79d7c8..0bf4743724 100644
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/ReturnResultPopup.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/ReturnResultPopup.xaml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<mct:Popup x:Class="CommunityToolkit.Maui.Sample.Views.Popups.ReturnResultPopup"
+<mct:Popup x:TypeArguments="system:String" x:Class="CommunityToolkit.Maui.Sample.Views.Popups.ReturnResultPopup"
            xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-           xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit">
+           xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
+           xmlns:system="clr-namespace:System;assembly=System.Runtime"
+           BackgroundColor="White">
 
-    <VerticalStackLayout Style="{StaticResource PopupLayout}">
+    <VerticalStackLayout Style="{StaticResource PopupLayout}"
+                         Spacing="12">
         <VerticalStackLayout.Resources>
             <ResourceDictionary>
                 <Style x:Key="Title" TargetType="Label">
@@ -24,7 +27,7 @@
                     <Setter Property="VerticalTextAlignment" Value="Center" />
                 </Style>
                 <Style x:Key="ConfirmButton" TargetType="Button">
-                    <Setter Property="VerticalOptions" Value="EndAndExpand" />
+                    <Setter Property="VerticalOptions" Value="End" />
                 </Style>
             </ResourceDictionary>
         </VerticalStackLayout.Resources>
@@ -34,7 +37,7 @@
                 Text="Return Result Popup" />
         <BoxView Style="{StaticResource Divider}" />
         <Label Style="{StaticResource Content}" 
-                Text="This popup returns a value when it is dismissed. The value varies depending if you tap on the CLOSE button or dismis the popup by tapping outside of it's bounds." />
+                Text="This popup returns a value when it is dismissed. The value varies depending if you tap on the CLOSE button or dismiss the popup by tapping outside its bounds." />
         <Button Text="CLOSE"
                 Style="{StaticResource ConfirmButton}"
                 Clicked="Button_Clicked" />
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/ReturnResultPopup.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Views/Popups/ReturnResultPopup.xaml.cs
index 47bfa3f471..166aa1f746 100644
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/ReturnResultPopup.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/ReturnResultPopup.xaml.cs
@@ -1,21 +1,14 @@
-using CommunityToolkit.Maui.Sample.Models;
-using CommunityToolkit.Maui.Views;
-
 namespace CommunityToolkit.Maui.Sample.Views.Popups;
 
-public partial class ReturnResultPopup : Popup
+public partial class ReturnResultPopup
 {
-	public ReturnResultPopup(PopupSizeConstants popupSizeConstants)
+	public ReturnResultPopup()
 	{
 		InitializeComponent();
-
-		Size = popupSizeConstants.Medium;
-		ResultWhenUserTapsOutsideOfPopup = "User Tapped Outside of Popup";
 	}
 
 	async void Button_Clicked(object? sender, EventArgs e)
 	{
-		var cts = new CancellationTokenSource(TimeSpan.FromSeconds(5));
-		await CloseAsync("Close button tapped", cts.Token);
+		await Close("Close button tapped");
 	}
 }
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/SimplePopup.xaml b/samples/CommunityToolkit.Maui.Sample/Views/Popups/SimplePopup.xaml
index cc745a8ff4..f4c67173f2 100644
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/SimplePopup.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/SimplePopup.xaml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<mct:Popup
+<ContentView
 	x:Class="CommunityToolkit.Maui.Sample.Views.Popups.SimplePopup"
 	xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
 	xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-	xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit">
+	xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
+    BackgroundColor="MediumPurple">
 
     <VerticalStackLayout Style="{StaticResource PopupLayout}">
 
@@ -44,4 +45,4 @@
             </Image.Behaviors>
         </Image>
     </VerticalStackLayout>
-</mct:Popup>
\ No newline at end of file
+</ContentView>
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/SimplePopup.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Views/Popups/SimplePopup.xaml.cs
index 3e886c62cb..2e491c46e4 100644
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/SimplePopup.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/SimplePopup.xaml.cs
@@ -1,14 +1,9 @@
-using CommunityToolkit.Maui.Sample.Models;
-using CommunityToolkit.Maui.Views;
-
 namespace CommunityToolkit.Maui.Sample.Views.Popups;
 
-public partial class SimplePopup : Popup
+public partial class SimplePopup : ContentView
 {
-	public SimplePopup(PopupSizeConstants popupSizeConstants)
+	public SimplePopup()
 	{
 		InitializeComponent();
-
-		Size = popupSizeConstants.Small;
 	}
 }
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/StyleClassPopup.xaml b/samples/CommunityToolkit.Maui.Sample/Views/Popups/StyleClassPopup.xaml
index 080cdd3086..c81a4aaec0 100644
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/StyleClassPopup.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/StyleClassPopup.xaml
@@ -3,14 +3,13 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
              xmlns:popups="clr-namespace:CommunityToolkit.Maui.Sample.Views.Popups"
-             x:Class="CommunityToolkit.Maui.Sample.Views.Popups.StyleClassPopup" StyleClass="PopupStyle">
+             x:Class="CommunityToolkit.Maui.Sample.Views.Popups.StyleClassPopup"
+             StyleClass="PopupStyle">
     <mct:Popup.Resources>
         <Style TargetType="{x:Type popups:StyleClassPopup}" Class="PopupStyle">
-            <Setter Property="Size" Value="150,150" />
-            <Setter Property="Color" Value="Pink" />
-            <Setter Property="HorizontalOptions" Value="Start" />
-            <Setter Property="VerticalOptions" Value="End" />
-            <Setter Property="CanBeDismissedByTappingOutsideOfPopup" Value="True" />
+            <Setter Property="WidthRequest" Value="150" />
+            <Setter Property="HeightRequest" Value="150" />
+            <Setter Property="BackgroundColor" Value="Pink" />
         </Style>
     </mct:Popup.Resources>
     
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/StyleClassPopup.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Views/Popups/StyleClassPopup.xaml.cs
index db92e5b37d..98d296a895 100644
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/StyleClassPopup.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/StyleClassPopup.xaml.cs
@@ -6,7 +6,7 @@ namespace CommunityToolkit.Maui.Sample.Views.Popups;
 /// This popup demonstrates how the <see cref="Style.Class"/> property can be used to apply
 /// a <see cref="Style"/> definition to a <see cref="Popup"/>.
 /// </summary>
-public partial class StyleClassPopup : Popup
+public partial class StyleClassPopup
 {
 	public StyleClassPopup()
 	{
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/StyleInheritancePopup.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Views/Popups/StyleInheritancePopup.xaml.cs
index 3d3edc21c6..17fddcb06c 100644
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/StyleInheritancePopup.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/StyleInheritancePopup.xaml.cs
@@ -6,7 +6,7 @@ namespace CommunityToolkit.Maui.Sample.Views.Popups;
 /// This popup demonstrates how the <see cref="Style.ApplyToDerivedTypes"/> property can allow for Popup implementations
 /// that inherit from <see cref="Popup"/> to still use a common <see cref="Style"/> definition.
 /// </summary>
-public partial class StyleInheritancePopup : Popup
+public partial class StyleInheritancePopup
 {
 	public StyleInheritancePopup()
 	{
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/ToggleSizePopup.xaml b/samples/CommunityToolkit.Maui.Sample/Views/Popups/ToggleSizePopup.xaml
index ab2e7a8fed..dfe7961292 100644
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/ToggleSizePopup.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/ToggleSizePopup.xaml
@@ -3,9 +3,11 @@
 	x:Class="CommunityToolkit.Maui.Sample.Views.Popups.ToggleSizePopup"
 	xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
 	xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-	xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit">
+	xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
+    BackgroundColor="White">
 
-	<VerticalStackLayout Style="{StaticResource PopupLayout}">
+	<VerticalStackLayout Style="{StaticResource PopupLayout}"
+                         Spacing="12">
 
 		<VerticalStackLayout.Resources>
 			<ResourceDictionary>
@@ -26,7 +28,7 @@
 					<Setter Property="VerticalTextAlignment" Value="Center" />
 				</Style>
 				<Style x:Key="ConfirmButton" TargetType="Button">
-					<Setter Property="VerticalOptions" Value="EndAndExpand" />
+					<Setter Property="VerticalOptions" Value="End" />
 				</Style>
 			</ResourceDictionary>
 		</VerticalStackLayout.Resources>
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/ToggleSizePopup.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Views/Popups/ToggleSizePopup.xaml.cs
index 276791b39e..dc0b97233f 100644
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/ToggleSizePopup.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/ToggleSizePopup.xaml.cs
@@ -1,28 +1,28 @@
-using CommunityToolkit.Maui.Sample.Models;
-using CommunityToolkit.Maui.Views;
-
 namespace CommunityToolkit.Maui.Sample.Views.Popups;
 
-public partial class ToggleSizePopup : Popup
+public partial class ToggleSizePopup : Maui.Views.Popup
 {
 	readonly Size originalSize;
 
-	public ToggleSizePopup(PopupSizeConstants popupSizeConstants)
+	public ToggleSizePopup()
 	{
 		InitializeComponent();
-
-		Size = originalSize = popupSizeConstants.Medium;
+		originalSize = new Size(300, 300);
+		WidthRequest = 300;
+		HeightRequest = 300;
 	}
 
 	void Button_Clicked(object? sender, EventArgs e)
 	{
-		if (originalSize == Size)
+		if (originalSize == new Size(WidthRequest, HeightRequest))
 		{
-			Size = new Size(originalSize.Width * 1.25, originalSize.Height * 1.25);
+			WidthRequest = originalSize.Width * 1.25;
+			HeightRequest = originalSize.Height * 1.25;
 		}
 		else
 		{
-			Size = originalSize;
+			WidthRequest = originalSize.Width;
+			HeightRequest = originalSize.Height;
 		}
 	}
 }
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/TransparentPopup.xaml b/samples/CommunityToolkit.Maui.Sample/Views/Popups/TransparentPopup.xaml
index 93eac0bde9..2108b83ba1 100644
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/TransparentPopup.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/TransparentPopup.xaml
@@ -4,7 +4,7 @@
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
-    Color="Transparent">
+    BackgroundColor="Transparent">
 
     <Grid RowDefinitions="96, *,60" Style="{StaticResource PopupLayout}" BackgroundColor="Transparent">
 		<Label Text="The background should be transparent"
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/TransparentPopup.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Views/Popups/TransparentPopup.xaml.cs
index 45294730a4..aa325fd9a7 100644
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/TransparentPopup.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/TransparentPopup.xaml.cs
@@ -1,14 +1,11 @@
-using CommunityToolkit.Maui.Views;
-
 namespace CommunityToolkit.Maui.Sample.Views.Popups;
 
-public partial class TransparentPopup : Popup
+public partial class TransparentPopup : Maui.Views.Popup
 {
 	public TransparentPopup() => InitializeComponent();
 
-	public async void CloseButtonClicked(object? sender, EventArgs args)
+	void CloseButtonClicked(object? sender, EventArgs args)
 	{
-		var cts = new CancellationTokenSource(TimeSpan.FromSeconds(5));
-		await CloseAsync(token: cts.Token);
+		Close();
 	}
 }
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/TransparentPopupCSharp.cs b/samples/CommunityToolkit.Maui.Sample/Views/Popups/TransparentPopupCSharp.cs
deleted file mode 100644
index 4fca5d6474..0000000000
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/TransparentPopupCSharp.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using CommunityToolkit.Maui.Markup;
-using CommunityToolkit.Maui.Views;
-using Microsoft.Maui.Controls.Shapes;
-
-namespace CommunityToolkit.Maui.Sample.Views.Popups;
-
-public sealed partial class TransparentPopupCSharp : Popup
-{
-	public TransparentPopupCSharp(Size popupSize) : this()
-	{
-		Size = popupSize;
-		Color = Colors.Transparent;
-	}
-
-	public TransparentPopupCSharp()
-	{
-		Content = new Border
-		{
-			StrokeShape = new RoundRectangle
-			{
-				CornerRadius = 25
-			}
-		}
-			.Size(50, 50)
-			.Margin(10);
-	}
-}
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/UpdatingPopup.xaml b/samples/CommunityToolkit.Maui.Sample/Views/Popups/UpdatingPopup.xaml
index 2fbec170cb..ff925442b0 100644
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/UpdatingPopup.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/UpdatingPopup.xaml
@@ -6,8 +6,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
     xmlns:viewModels="clr-namespace:CommunityToolkit.Maui.Sample.ViewModels.Views"
-    x:DataType="viewModels:UpdatingPopupViewModel"
-    CanBeDismissedByTappingOutsideOfPopup="False">
+    x:DataType="viewModels:UpdatingPopupViewModel">
 
     <VerticalStackLayout Style="{StaticResource PopupLayout}" Spacing="12" MinimumHeightRequest="350">
         <VerticalStackLayout.Resources>
@@ -29,7 +28,7 @@
                     <Setter Property="VerticalTextAlignment" Value="Center" />
                 </Style>
                 <Style x:Key="ConfirmButton" TargetType="Button">
-                    <Setter Property="VerticalOptions" Value="EndAndExpand" />
+                    <Setter Property="VerticalOptions" Value="End" />
                     <Setter Property="HorizontalOptions" Value="Center" />
                 </Style>
 
@@ -37,21 +36,24 @@
             </ResourceDictionary>
         </VerticalStackLayout.Resources>
 
-        <Label Style="{StaticResource Title}" Text="Updating" />
+        <Label Style="{StaticResource Title}" 
+               Text="Updating" />
 
         <BoxView Style="{StaticResource Divider}" />
 
         <ActivityIndicator
             IsRunning="{Binding UpdateProgress, Converter={toolkit:CompareConverter ComparingValue={StaticResource ComparingValue}, ComparisonOperator=Smaller, FalseObject=False, TrueObject=True}}" />
 
-        <Label Style="{StaticResource Content}" Text="{Binding Message}" />
+        <Label Style="{StaticResource Content}" 
+               Text="{Binding Message}" 
+               TextColor="Black"/>
 
         <ProgressBar Progress="{Binding UpdateProgress}" />
 
         <Button
             Command="{Binding MoreCommand}"
             Style="{StaticResource ConfirmButton}"
-            Text="More" />
+            Text="Load Another Popup" />
         
         <Button
             Command="{Binding FinishCommand}"
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/UpdatingPopup.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Views/Popups/UpdatingPopup.xaml.cs
index 0b1b566c4a..434ec5908a 100644
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/UpdatingPopup.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/UpdatingPopup.xaml.cs
@@ -9,5 +9,9 @@ public UpdatingPopup(UpdatingPopupViewModel updatingPopupViewModel)
 	{
 		InitializeComponent();
 		BindingContext = updatingPopupViewModel;
+		Opened += (_, _) =>
+		{
+			updatingPopupViewModel.PerformUpdates(3);
+		};
 	}
 }
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/XamlBindingPopup.xaml b/samples/CommunityToolkit.Maui.Sample/Views/Popups/XamlBindingPopup.xaml
index fe522769cb..09e58490a6 100644
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/XamlBindingPopup.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/XamlBindingPopup.xaml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<mct:Popup xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
            x:Class="CommunityToolkit.Maui.Sample.Views.Popups.XamlBindingPopup"
            xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
            xmlns:vm="clr-namespace:CommunityToolkit.Maui.Sample.ViewModels.Views"
-           x:DataType="vm:XamlBindingPopupViewModel">    
+           x:DataType="vm:XamlBindingPopupViewModel"
+           BackgroundColor="White">    
 
-    <mct:Popup.BindingContext>
+    <ContentView.BindingContext>
         <vm:XamlBindingPopupViewModel />
-    </mct:Popup.BindingContext>    
+    </ContentView.BindingContext>    
     
     <VerticalStackLayout
         Style="{StaticResource PopupLayout}"
-        HorizontalOptions="Center">
+        HorizontalOptions="Center"
+        Spacing="12">
         <VerticalStackLayout.Resources>
             <ResourceDictionary>
                 <Style x:Key="Title" TargetType="Label">
@@ -39,8 +41,9 @@
         <BoxView Style="{StaticResource Divider}" />
         <Label Style="{StaticResource Content}" 
                HorizontalTextAlignment="Center"
+               TextColor="Black"
                MaxLines="5"
                LineBreakMode="WordWrap"
                Text="{Binding Message}" />
     </VerticalStackLayout>
-</mct:Popup>
\ No newline at end of file
+</ContentView>
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/XamlBindingPopup.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Views/Popups/XamlBindingPopup.xaml.cs
index e7e82838ff..ee625a928f 100644
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/XamlBindingPopup.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/XamlBindingPopup.xaml.cs
@@ -1,14 +1,9 @@
-using CommunityToolkit.Maui.Sample.Models;
-using CommunityToolkit.Maui.Views;
-
 namespace CommunityToolkit.Maui.Sample.Views.Popups;
 
-public partial class XamlBindingPopup : Popup
+public partial class XamlBindingPopup : ContentView
 {
-	public XamlBindingPopup(PopupSizeConstants popupSizeConstants)
+	public XamlBindingPopup()
 	{
 		InitializeComponent();
-
-		Size = popupSizeConstants.Large;
 	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj b/src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj
index 953296b689..ef460510b7 100644
--- a/src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj
+++ b/src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj
@@ -12,7 +12,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
+    <AssemblyAttribute Include="System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage" />
+    <Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest"/>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/CommunityToolkit.Maui.Core/Extensions/NullableExtensions.cs b/src/CommunityToolkit.Maui.Core/Extensions/NullableExtensions.cs
new file mode 100644
index 0000000000..20427191bc
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/Extensions/NullableExtensions.cs
@@ -0,0 +1,19 @@
+namespace CommunityToolkit.Maui.Core.Extensions;
+
+static class NullableExtensions
+{
+	public static bool IsNullable(this Type type)
+	{
+		if (!type.IsValueType)
+		{
+			return true; // ref-type
+		}
+
+		if (Nullable.GetUnderlyingType(type) is not null)
+		{
+			return true; // Nullable<T>
+		}
+
+		return false; // value-type
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Handlers/Popup/PopUpHandler.android.cs b/src/CommunityToolkit.Maui.Core/Handlers/Popup/PopUpHandler.android.cs
deleted file mode 100644
index 7bb2f4173d..0000000000
--- a/src/CommunityToolkit.Maui.Core/Handlers/Popup/PopUpHandler.android.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-using CommunityToolkit.Maui.Core.Views;
-using Microsoft.Maui.Handlers;
-using Microsoft.Maui.Platform;
-using AView = Android.Views.View;
-
-namespace CommunityToolkit.Maui.Core.Handlers;
-
-public partial class PopupHandler : ElementHandler<IPopup, MauiPopup>
-{
-	internal AView? Container { get; set; }
-	internal int LastPopupWidth { get; set; }
-	internal int LastPopupHeight { get; set; }
-	internal double LastWindowWidth { get; set; }
-	internal double LastWindowHeight { get; set; }
-
-	/// <summary>
-	/// Action that's triggered when the Popup is closed
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-	/// <param name="result">The result that should return from this Popup.</param>
-	public static void MapOnClosed(PopupHandler handler, IPopup view, object? result)
-	{
-		var popup = handler.PlatformView;
-
-		if (!popup.Context.GetActivity().IsDestroyed())
-		{
-			if (popup.IsShowing)
-			{
-				popup.Dismiss();
-			}
-		}
-
-		view.HandlerCompleteTCS.TrySetResult();
-
-		handler.DisconnectHandler(popup);
-	}
-
-	/// <summary>
-	/// Action that's triggered when the Popup is Opened.
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-	/// <param name="result">We don't need to provide the result parameter here.</param>
-	public static void MapOnOpened(PopupHandler handler, IPopup view, object? result)
-	{
-		handler.PlatformView.Show();
-	}
-
-	/// <summary>
-	/// Action that's triggered when the Popup is dismissed by tapping outside of the popup.
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-	/// <param name="result">The result that should return from this Popup.</param>
-	public static void MapOnDismissedByTappingOutsideOfPopup(PopupHandler handler, IPopup view, object? result)
-	{
-		if (view.CanBeDismissedByTappingOutsideOfPopup)
-		{
-			view.OnDismissedByTappingOutsideOfPopup();
-		}
-	}
-
-	/// <summary>
-	/// Action that's triggered when the Popup <see cref="IPopup.Anchor"/> property changes.
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-	public static void MapAnchor(PopupHandler handler, IPopup view)
-	{
-		handler.PlatformView.SetAnchor(view);
-	}
-
-	/// <summary>
-	/// Action that's triggered when the Popup <see cref="IPopup.CanBeDismissedByTappingOutsideOfPopup"/> property changes.
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-	public static void MapCanBeDismissedByTappingOutsideOfPopup(PopupHandler handler, IPopup view)
-	{
-		handler.PlatformView.SetCanBeDismissedByTappingOutsideOfPopup(view);
-	}
-
-	/// <summary>
-	/// Action that's triggered when the Popup <see cref="IPopup.Color"/> property changes.
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-	public static void MapColor(PopupHandler handler, IPopup view)
-	{
-		handler.PlatformView.SetColor(view);
-	}
-
-	/// <summary>
-	/// Action that's triggered when the Popup <see cref="IPopup.Size"/> property changes.
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-	public static void MapSize(PopupHandler handler, IPopup view)
-	{
-		ArgumentNullException.ThrowIfNull(handler.Container);
-
-		handler.PlatformView.SetSize(view, handler.Container, handler);
-	}
-
-	/// <inheritdoc/>
-	protected override MauiPopup CreatePlatformElement()
-	{
-		_ = MauiContext ?? throw new InvalidOperationException("MauiContext is null, please check your MauiApplication.");
-		_ = MauiContext.Context ?? throw new InvalidOperationException("Android Context is null, please check your MauiApplication.");
-
-		return new MauiPopup(MauiContext.Context, MauiContext);
-	}
-
-	/// <inheritdoc/>
-	protected override void ConnectHandler(MauiPopup platformView)
-	{
-		Container = platformView.SetElement(VirtualView);
-
-		if (Container is not null)
-		{
-			Container.LayoutChange += OnLayoutChange;
-		}
-	}
-
-	/// <inheritdoc/>
-	protected override void DisconnectHandler(MauiPopup platformView)
-	{
-		platformView.Dispose();
-
-		if (Container is not null)
-		{
-			Container.LayoutChange -= OnLayoutChange;
-		}
-	}
-
-	void OnShowed(object? sender, EventArgs args)
-	{
-		_ = VirtualView ?? throw new InvalidOperationException($"{nameof(VirtualView)} cannot be null");
-
-		VirtualView.OnOpened();
-	}
-
-	void OnLayoutChange(object? sender, EventArgs e)
-	{
-		if (VirtualView?.Handler?.PlatformView is Dialog dialog && Container is not null)
-		{
-			PopupExtensions.SetSize(dialog, VirtualView, Container, this);
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Handlers/Popup/PopUpHandler.windows.cs b/src/CommunityToolkit.Maui.Core/Handlers/Popup/PopUpHandler.windows.cs
deleted file mode 100644
index 0ea2845638..0000000000
--- a/src/CommunityToolkit.Maui.Core/Handlers/Popup/PopUpHandler.windows.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-using CommunityToolkit.Maui.Core.Extensions;
-using CommunityToolkit.Maui.Core.Views;
-using Microsoft.Maui.Handlers;
-using Microsoft.Maui.Platform;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Windows.UI.ViewManagement;
-
-namespace CommunityToolkit.Maui.Core.Handlers;
-
-public partial class PopupHandler : ElementHandler<IPopup, Popup>
-{
-	/// <summary>
-	/// Action that's triggered when the Popup is Dismissed.
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-	/// <param name="result">The result that should return from this Popup.</param>
-	public static void MapOnClosed(PopupHandler handler, IPopup view, object? result)
-	{
-		var window = view.GetWindow();
-		if (window.Overlays.FirstOrDefault() is IWindowOverlay popupOverlay)
-		{
-			window.RemoveOverlay(popupOverlay);
-		}
-
-		view.HandlerCompleteTCS.TrySetResult();
-		handler.DisconnectHandler(handler.PlatformView);
-	}
-
-	/// <summary>
-	/// Action that's triggered when the Popup is Opened.
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-	/// <param name="result">We don't need to provide the result parameter here.</param>
-	public static void MapOnOpened(PopupHandler handler, IPopup view, object? result)
-	{
-		ArgumentNullException.ThrowIfNull(view.Parent);
-		ArgumentNullException.ThrowIfNull(handler.MauiContext);
-
-		var parent = view.Parent.ToPlatform(handler.MauiContext);
-		parent.IsHitTestVisible = false;
-		handler.PlatformView.XamlRoot = view.GetWindow().Content?.Handler?.MauiContext?.GetPlatformWindow().Content.XamlRoot ?? throw new InvalidOperationException("Window Content cannot be null");
-		handler.PlatformView.IsHitTestVisible = true;
-		handler.PlatformView.IsOpen = true;
-
-		AddOverlayToWindow(view.GetWindow());
-
-		view.OnOpened();
-	}
-
-
-	/// <summary>
-	/// Action that's triggered when the Popup is dismissed by tapping outside of the Popup.
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-	/// <param name="result">The result that should return from this Popup.</param>
-	public static void MapOnDismissedByTappingOutsideOfPopup(PopupHandler handler, IPopup view, object? result)
-	{
-		view.OnDismissedByTappingOutsideOfPopup();
-		handler.DisconnectHandler(handler.PlatformView);
-	}
-
-	/// <summary>
-	/// Action that's triggered when the Popup <see cref="IPopup.Anchor"/> property changes.
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-	public static void MapAnchor(PopupHandler handler, IPopup view)
-	{
-		handler.PlatformView.SetAnchor(view, handler.MauiContext);
-	}
-
-	/// <summary>
-	/// Action that's triggered when the Popup <see cref="IPopup.CanBeDismissedByTappingOutsideOfPopup"/> property changes.
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-	public static void MapCanBeDismissedByTappingOutsideOfPopup(PopupHandler handler, IPopup view)
-	{
-		handler.PlatformView.IsLightDismissEnabled = view.CanBeDismissedByTappingOutsideOfPopup;
-		handler.PlatformView.LightDismissOverlayMode = LightDismissOverlayMode.Off;
-	}
-
-	/// <summary>
-	/// Action that's triggered when the Popup <see cref="IPopup.Color"/> property changes.
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-	public static void MapColor(PopupHandler handler, IPopup view)
-	{
-		handler.PlatformView.SetColor(view);
-	}
-
-	/// <summary>
-	/// Action that's triggered when the Popup <see cref="IPopup.Size"/> property changes.
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-	public static void MapSize(PopupHandler handler, IPopup view)
-	{
-		handler.PlatformView.SetSize(view, handler.MauiContext);
-	}
-
-	/// <inheritdoc/>
-	protected override void DisconnectHandler(Popup platformView)
-	{
-		if (VirtualView.Parent is null)
-		{
-			return;
-		}
-
-		ArgumentNullException.ThrowIfNull(VirtualView.Handler?.MauiContext);
-		var parent = VirtualView.Parent.ToPlatform(VirtualView.Handler.MauiContext);
-		parent.IsHitTestVisible = true;
-		platformView.IsOpen = false;
-		platformView.Closed -= OnClosed;
-		if (MauiContext is not null)
-		{
-			MauiContext.GetPlatformWindow().SizeChanged -= OnSizeChanged;
-		}
-	}
-
-	/// <inheritdoc/>
-	protected override Popup CreatePlatformElement()
-	{
-		var popup = new Popup();
-		return popup;
-	}
-
-	/// <inheritdoc/>
-	protected override void ConnectHandler(Popup platformView)
-	{
-		platformView.Closed += OnClosed;
-		platformView.ConfigureControl(VirtualView, MauiContext);
-		if (MauiContext is not null)
-		{
-			MauiContext.GetPlatformWindow().SizeChanged += OnSizeChanged;
-		}
-		base.ConnectHandler(platformView);
-	}
-
-	static void AddOverlayToWindow(IWindow window)
-	{
-		var uiSetting = new UISettings();
-		var backgroundColor = uiSetting.GetColorValue(UIColorType.Background).ToColor();
-		window.AddOverlay(new PopupOverlay(window, backgroundColor.IsDark()
-													? Color.FromRgba(0, 0, 0, 153)
-													: Color.FromRgba(255, 255, 255, 153))); // 60% Opacity
-	}
-
-	void OnClosed(object? sender, object e)
-	{
-		if (!PlatformView.IsOpen && VirtualView.CanBeDismissedByTappingOutsideOfPopup)
-		{
-			VirtualView.Handler?.Invoke(nameof(IPopup.OnDismissedByTappingOutsideOfPopup));
-		}
-	}
-
-	void OnSizeChanged(object? sender, WindowSizeChangedEventArgs e)
-	{
-		if (VirtualView is not null)
-		{
-			PopupExtensions.SetSize(PlatformView, VirtualView, MauiContext);
-			PopupExtensions.SetLayout(PlatformView, VirtualView, MauiContext);
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Handlers/Popup/PopupHandler.macios.cs b/src/CommunityToolkit.Maui.Core/Handlers/Popup/PopupHandler.macios.cs
deleted file mode 100644
index 306cbda1eb..0000000000
--- a/src/CommunityToolkit.Maui.Core/Handlers/Popup/PopupHandler.macios.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-using CommunityToolkit.Maui.Core.Views;
-using Microsoft.Maui.Handlers;
-
-namespace CommunityToolkit.Maui.Core.Handlers;
-
-public partial class PopupHandler : ElementHandler<IPopup, MauiPopup>
-{
-	/// <summary>
-	/// Action that's triggered when the Popup is Dismissed.
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-	/// <param name="result">The result that should return from this Popup.</param>
-	public static async void MapOnClosed(PopupHandler handler, IPopup view, object? result)
-	{
-		var presentationController = handler.PlatformView.PresentationController;
-		if (presentationController?.PresentedViewController is UIViewController presentationViewController)
-		{
-			await presentationViewController.DismissViewControllerAsync(true);
-		}
-
-		view.HandlerCompleteTCS.TrySetResult();
-
-		handler.DisconnectHandler(handler.PlatformView);
-	}
-
-	/// <summary>
-	/// Action that's triggered when the Popup is dismissed by tapping outside of the Popup.
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-	/// <param name="result">The result that should return from this Popup.</param>
-	public static void MapOnDismissedByTappingOutsideOfPopup(PopupHandler handler, IPopup view, object? result)
-	{
-		if (handler.PlatformView is not MauiPopup popupRenderer)
-		{
-			throw new InvalidOperationException($"{nameof(handler.PlatformView)} must be of type {typeof(PopupHandler)}.");
-		}
-
-		if (popupRenderer.IsViewLoaded && view.CanBeDismissedByTappingOutsideOfPopup)
-		{
-			view.OnDismissedByTappingOutsideOfPopup();
-		}
-	}
-
-	/// <summary>
-	/// Action that's triggered when the Popup <see cref="IPopup.Anchor"/> property changes.
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-
-	public static void MapAnchor(PopupHandler handler, IPopup view)
-	{
-		handler.PlatformView.SetSize(view);
-		handler.PlatformView.SetLayout(view);
-	}
-
-	/// <summary>
-	/// Action that's triggered when the Popup <see cref="IPopup.CanBeDismissedByTappingOutsideOfPopup"/> property changes.
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-	public static void MapCanBeDismissedByTappingOutsideOfPopup(PopupHandler handler, IPopup view)
-	{
-		handler.PlatformView.SetCanBeDismissedByTappingOutsideOfPopup(view);
-	}
-
-	/// <summary>
-	/// Action that's triggered when the Popup <see cref="IPopup.Color"/> property changes.
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-	public static void MapColor(PopupHandler handler, IPopup view)
-	{
-		handler.PlatformView.SetBackgroundColor(view);
-	}
-
-	/// <summary>
-	/// Action that's triggered when the Popup <see cref="IPopup.Size"/> property changes.
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-	public static void MapSize(PopupHandler handler, IPopup view)
-	{
-		handler.PlatformView.SetSize(view);
-		handler.PlatformView.SetLayout(view);
-	}
-
-	/// <inheritdoc/>
-	protected override void ConnectHandler(MauiPopup platformView)
-	{
-		base.ConnectHandler(platformView);
-		platformView.SetElement(VirtualView);
-	}
-
-	/// <inheritdoc/>
-	protected override MauiPopup CreatePlatformElement()
-	{
-		return new MauiPopup(MauiContext ?? throw new NullReferenceException(nameof(MauiContext)));
-	}
-
-	/// <inheritdoc/>
-	protected override void DisconnectHandler(MauiPopup platformView)
-	{
-		base.DisconnectHandler(platformView);
-		platformView.CleanUp();
-	}
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Handlers/Popup/PopupHandler.net.cs b/src/CommunityToolkit.Maui.Core/Handlers/Popup/PopupHandler.net.cs
deleted file mode 100644
index 4e096b5256..0000000000
--- a/src/CommunityToolkit.Maui.Core/Handlers/Popup/PopupHandler.net.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-namespace CommunityToolkit.Maui.Core.Handlers;
-
-public partial class PopupHandler : Microsoft.Maui.Handlers.ElementHandler<IPopup, object>
-{
-	/// <inheritdoc/>
-	protected override object CreatePlatformElement() => throw new NotSupportedException();
-
-	/// <summary>
-	/// Action that's triggered when the Popup is closed.
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-	/// <param name="result">The result that should return from this Popup.</param>
-	public static void MapOnClosed(PopupHandler handler, IPopup view, object? result)
-	{
-		throw new NotSupportedException();
-	}
-
-	/// <summary>
-	/// Action that's triggered when the Popup is Opened.
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-	/// <param name="result">We don't need to provide the result parameter here.</param>
-	public static void MapOnOpened(PopupHandler handler, IPopup view, object? result)
-	{
-		throw new NotSupportedException();
-	}
-
-	/// <summary>
-	/// Action that's triggered when the Popup is dismissed by tapping outside of the Popup.
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-	/// <param name="result">The result that should return from this Popup.</param>
-	public static void MapOnDismissedByTappingOutsideOfPopup(PopupHandler handler, IPopup view, object? result)
-	{
-		throw new NotSupportedException();
-	}
-
-	/// <summary>
-	/// Action that's triggered when the Popup <see cref="IPopup.Anchor"/> property changes.
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-	public static void MapAnchor(PopupHandler handler, IPopup view)
-	{
-		throw new NotSupportedException();
-	}
-
-	/// <summary>
-	/// Action that's triggered when the Popup <see cref="IPopup.CanBeDismissedByTappingOutsideOfPopup"/> property changes.
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-	public static void MapCanBeDismissedByTappingOutsideOfPopup(PopupHandler handler, IPopup view)
-	{
-		throw new NotSupportedException();
-	}
-
-	/// <summary>
-	/// Action that's triggered when the Popup <see cref="IPopup.Color"/> property changes.
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-	public static void MapColor(PopupHandler handler, IPopup view)
-	{
-		throw new NotSupportedException();
-	}
-
-	/// <summary>
-	/// Action that's triggered when the Popup <see cref="IPopup.Size"/> property changes.
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-	public static void MapSize(PopupHandler handler, IPopup view)
-	{
-		throw new NotSupportedException();
-	}
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Handlers/Popup/PopupHandler.shared.cs b/src/CommunityToolkit.Maui.Core/Handlers/Popup/PopupHandler.shared.cs
deleted file mode 100644
index 128a156967..0000000000
--- a/src/CommunityToolkit.Maui.Core/Handlers/Popup/PopupHandler.shared.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-namespace CommunityToolkit.Maui.Core.Handlers;
-
-/// <summary>
-/// Handler Popup control
-/// </summary>
-public partial class PopupHandler
-{
-	/// <summary>
-	/// PropertyMapper for Popup Control
-	/// </summary>
-	public static IPropertyMapper<IPopup, PopupHandler> PopUpMapper = new PropertyMapper<IPopup, PopupHandler>(ElementMapper)
-	{
-		[nameof(IPopup.Anchor)] = MapAnchor,
-		[nameof(IPopup.Color)] = MapColor,
-		[nameof(IPopup.Size)] = MapSize,
-		[nameof(IPopup.VerticalOptions)] = MapSize,
-		[nameof(IPopup.HorizontalOptions)] = MapSize,
-		[nameof(IPopup.CanBeDismissedByTappingOutsideOfPopup)] = MapCanBeDismissedByTappingOutsideOfPopup
-	};
-
-	/// <summary>
-	/// <see cref ="CommandMapper"/> for Popup Control.
-	/// </summary>
-	public static CommandMapper<IPopup, PopupHandler> PopUpCommandMapper = new(ElementCommandMapper)
-	{
-#if !(IOS || MACCATALYST)
-		[nameof(IPopup.OnOpened)] = MapOnOpened,
-		[nameof(IPopup.OnClosed)] = MapOnClosed,
-#endif
-		[nameof(IPopup.OnDismissedByTappingOutsideOfPopup)] = MapOnDismissedByTappingOutsideOfPopup
-	};
-
-	/// <summary>
-	/// Constructor for <see cref="PopupHandler"/>.
-	/// </summary>
-	/// <param name="mapper">Custom instance of <see cref="PropertyMapper"/>, if it's null the <see cref="PopUpMapper"/> will be used</param>
-	/// <param name="commandMapper">Custom instance of <see cref="CommandMapper"/>, if it's null the <see cref="PopUpCommandMapper"/> will be used</param>
-	public PopupHandler(IPropertyMapper? mapper, CommandMapper? commandMapper)
-		: base(mapper ?? PopUpMapper, commandMapper ?? PopUpCommandMapper)
-	{
-	}
-
-	/// <summary>
-	/// Default Constructor for <see cref="PopupHandler"/>.
-	/// </summary>
-	public PopupHandler()
-		: base(PopUpMapper, PopUpCommandMapper)
-	{
-	}
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Handlers/Popup/PopupHandler.tizen.cs b/src/CommunityToolkit.Maui.Core/Handlers/Popup/PopupHandler.tizen.cs
deleted file mode 100644
index aec7b798df..0000000000
--- a/src/CommunityToolkit.Maui.Core/Handlers/Popup/PopupHandler.tizen.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-using CommunityToolkit.Maui.Core.Views;
-using Tizen.UIExtensions.NUI;
-
-namespace CommunityToolkit.Maui.Core.Handlers;
-
-public partial class PopupHandler : Microsoft.Maui.Handlers.ElementHandler<IPopup, MauiPopup>
-{
-	/// <summary>
-	/// Action that's triggered when the Popup is closed.
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-	/// <param name="result">The result that should return from this Popup.</param>
-	public static void MapOnClosed(PopupHandler handler, IPopup view, object? result)
-	{
-		var popup = handler.PlatformView;
-
-		if (popup.IsOpen)
-		{
-			popup.Close();
-		}
-		view.HandlerCompleteTCS.TrySetResult();
-
-		handler.DisconnectHandler(popup);
-	}
-
-	/// <summary>
-	/// Action that's triggered when the Popup is Opened.
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-	/// <param name="result">We don't need to provide the result parameter here.</param>
-	public static void MapOnOpened(PopupHandler handler, IPopup view, object? result)
-	{
-		handler.PlatformView.ShowPopup();
-	}
-
-	/// <summary>
-	/// Action that's triggered when the Popup is dismissed by tapping outside of the Popup.
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-	/// <param name="result">The result that should return from this Popup.</param>
-	public static void MapOnDismissedByTappingOutsideOfPopup(PopupHandler handler, IPopup view, object? result)
-	{
-		if (view.CanBeDismissedByTappingOutsideOfPopup)
-		{
-			view.OnDismissedByTappingOutsideOfPopup();
-		}
-	}
-
-	/// <summary>
-	/// Action that's triggered when the Popup <see cref="IPopup.Anchor"/> property changes.
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-	public static void MapAnchor(PopupHandler handler, IPopup view)
-	{
-		// On Tizen, Anchor only update when popup is opened
-	}
-
-	/// <summary>
-	/// Action that's triggered when the Popup <see cref="IPopup.CanBeDismissedByTappingOutsideOfPopup"/> property changes.
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-	public static void MapCanBeDismissedByTappingOutsideOfPopup(PopupHandler handler, IPopup view)
-	{
-		// this property directly access on platform view
-	}
-
-	/// <summary>
-	/// Action that's triggered when the Popup <see cref="IPopup.Color"/> property changes.
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-	public static void MapColor(PopupHandler handler, IPopup view)
-	{
-		// this property directly access on platform view
-	}
-
-	/// <summary>
-	/// Action that's triggered when the Popup <see cref="IPopup.Size"/> property changes.
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-	public static void MapSize(PopupHandler handler, IPopup view)
-	{
-		handler.PlatformView.UpdateContentSize();
-	}
-
-	/// <inheritdoc/>
-	protected override void ConnectHandler(MauiPopup platformView)
-	{
-		platformView.SetElement(VirtualView);
-	}
-
-	/// <inheritdoc/>
-	protected override MauiPopup CreatePlatformElement()
-	{
-		var mauiContext = MauiContext ?? throw new InvalidOperationException("${nameof(MauiContext)} cannot be null");
-		return new MauiPopup(mauiContext);
-	}
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/IPopupService.cs b/src/CommunityToolkit.Maui.Core/IPopupService.cs
deleted file mode 100644
index 6031ac4210..0000000000
--- a/src/CommunityToolkit.Maui.Core/IPopupService.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using System.ComponentModel;
-
-namespace CommunityToolkit.Maui.Core;
-
-/// <summary>
-/// Provides a mechanism for displaying <see cref="CommunityToolkit.Maui.Core.IPopup"/>s based on the underlying view model.
-/// </summary>
-public interface IPopupService
-{
-	/// <summary>
-	/// Close the currently displayed Popup.
-	/// </summary>
-	/// <remarks>
-	/// This method must be called on the UI thread otherwise it will throw an <see cref="InvalidOperationException"/>.
-	/// </remarks>
-	/// <param name="result">An optional result to be returned from the popup.</param>
-	/// <exception cref="InvalidOperationException">Thrown if this method is not called on the UI thread.</exception>
-	void ClosePopup(object? result = null);
-
-	/// <summary>
-	/// Close the currently displayed Popup.
-	/// </summary>
-	/// <remarks>
-	/// This method must be called on the UI thread otherwise it will throw an <see cref="InvalidOperationException"/>.
-	/// </remarks>
-	/// <param name="result">An optional result to be returned from the popup.</param>
-	/// <returns>A <see cref="Task"/> that can be awaited.</returns>
-	/// <exception cref="InvalidOperationException">Thrown if this method is not called on the UI thread.</exception>
-	Task ClosePopupAsync(object? result = null);
-
-	/// <summary>
-	/// Resolves and displays a <see cref="CommunityToolkit.Maui.Core.IPopup"/> and <typeparamref name="TViewModel"/> pair that was registered with <c>AddTransientPopup</c>.
-	/// </summary>
-	/// <remarks>
-	/// This method must be called on the UI thread otherwise it will throw an <see cref="InvalidOperationException"/>.
-	/// </remarks>
-	/// <typeparam name="TViewModel">The type of the view model registered with the <see cref="CommunityToolkit.Maui.Core.IPopup"/>.</typeparam>
-	/// <exception cref="InvalidOperationException">Thrown if this method is not called on the UI thread.</exception>
-	void ShowPopup<TViewModel>() where TViewModel : INotifyPropertyChanged;
-
-	/// <summary>
-	/// Resolves and displays a <see cref="CommunityToolkit.Maui.Core.IPopup"/> and <typeparamref name="TViewModel"/> pair that was registered with <c>AddTransientPopup</c>.
-	/// The supplied <paramref name="onPresenting"/> provides a mechanism to invoke any methods on your view model in order to load or pass data to it.
-	/// </summary>
-	/// <remarks>
-	/// This method must be called on the UI thread otherwise it will throw an <see cref="InvalidOperationException"/>.
-	/// </remarks>
-	/// <typeparam name="TViewModel">The type of the view model registered with the <see cref="CommunityToolkit.Maui.Core.IPopup"/>.</typeparam>
-	/// <param name="onPresenting">An <see cref="Action{TViewModel}"/> that will be performed before the popup is presented.</param>
-	/// <exception cref="InvalidOperationException">Thrown if this method is not called on the UI thread.</exception>
-	void ShowPopup<TViewModel>(Action<TViewModel> onPresenting) where TViewModel : INotifyPropertyChanged;
-
-	/// <summary>
-	/// Resolves and displays a <see cref="CommunityToolkit.Maui.Core.IPopup"/> and <typeparamref name="TViewModel"/> pair that was registered with <c>AddTransientPopup</c>.
-	/// </summary>
-	/// <remarks>
-	/// This method must be called on the UI thread otherwise it will throw an <see cref="InvalidOperationException"/>.
-	/// </remarks>
-	/// <typeparam name="TViewModel">The type of the view model registered with the <see cref="CommunityToolkit.Maui.Core.IPopup"/>.</typeparam>
-	/// <param name="token"><see cref="CancellationToken"/> </param>
-	/// <returns>A <see cref="Task"/> that can be awaited to return the result of the <see cref="CommunityToolkit.Maui.Core.IPopup"/> once it has been dismissed.</returns>
-	/// <exception cref="InvalidOperationException">Thrown if this method is not called on the UI thread.</exception>
-	Task<object?> ShowPopupAsync<TViewModel>(CancellationToken token = default) where TViewModel : INotifyPropertyChanged;
-
-	/// <summary>
-	/// Resolves and displays a <see cref="CommunityToolkit.Maui.Core.IPopup"/> and <typeparamref name="TViewModel"/> pair that was registered with <c>AddTransientPopup</c>.
-	/// The supplied <paramref name="onPresenting"/> provides a mechanism to invoke any methods on your view model in order to load or pass data to it.
-	/// </summary>
-	/// <remarks>
-	/// This method must be called on the UI thread otherwise it will throw an <see cref="InvalidOperationException"/>.
-	/// </remarks>
-	/// <typeparam name="TViewModel">The type of the view model registered with the <see cref="CommunityToolkit.Maui.Core.IPopup"/>.</typeparam>
-	/// <returns>A <see cref="Task"/> that can be awaited to return the result of the <see cref="CommunityToolkit.Maui.Core.IPopup"/> once it has been dismissed.</returns>
-	/// <param name="onPresenting">An <see cref="Action{TViewModel}"/> that will be performed before the popup is presented.</param>
-	/// <param name="token"><see cref="CancellationToken"/> </param>
-	/// <exception cref="InvalidOperationException">Thrown if this method is not called on the UI thread.</exception>
-	Task<object?> ShowPopupAsync<TViewModel>(Action<TViewModel> onPresenting, CancellationToken token = default) where TViewModel : INotifyPropertyChanged;
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Interfaces/IPopup.shared.cs b/src/CommunityToolkit.Maui.Core/Interfaces/IPopup.shared.cs
deleted file mode 100644
index b596eb8f22..0000000000
--- a/src/CommunityToolkit.Maui.Core/Interfaces/IPopup.shared.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using IElement = Microsoft.Maui.IElement;
-using LayoutAlignment = Microsoft.Maui.Primitives.LayoutAlignment;
-
-namespace CommunityToolkit.Maui.Core;
-
-/// <summary>
-/// Represents a small View that pops up at front the Page.
-/// </summary>
-public interface IPopup : IElement, IVisualTreeElement, IAsynchronousHandler
-{
-	/// <summary>
-	/// Gets the View that Popup will be anchored.
-	/// </summary>
-	IView? Anchor { get; }
-
-	/// <summary>
-	/// Gets the Popup's color.
-	/// </summary>
-	Color? Color { get; }
-
-	/// <summary>
-	/// Gets the Popup's Content.
-	/// </summary>
-	IView? Content { get; }
-
-	/// <summary>
-	/// Gets the horizontal aspect of this element's arrangement in a container.
-	/// </summary>
-	LayoutAlignment HorizontalOptions { get; }
-
-	/// <summary>
-	/// Gets the CanBeDismissedByTappingOutsideOfPopup property.
-	/// </summary>
-	bool CanBeDismissedByTappingOutsideOfPopup { get; }
-
-	/// <summary>
-	/// Gets the Popup's size.
-	/// </summary>
-	Size Size { get; }
-
-	/// <summary>
-	/// Gets the vertical aspect of this element's arrangement in a container.
-	/// </summary>
-	LayoutAlignment VerticalOptions { get; }
-
-	/// <summary>
-	/// Occurs when the Popup is closed.
-	/// </summary>
-	/// <param name="result">Return value from the Popup.</param>
-	void OnClosed(object? result = null);
-
-	/// <summary>
-	/// Occurs when the Popup is opened.
-	/// </summary>
-	void OnOpened();
-
-	/// <summary>
-	/// Occurs when the Popup is dismissed by a user tapping outside the Popup.
-	/// </summary>
-	void OnDismissedByTappingOutsideOfPopup();
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Interfaces/IPopupResult.shared.cs b/src/CommunityToolkit.Maui.Core/Interfaces/IPopupResult.shared.cs
new file mode 100644
index 0000000000..c2f22984a8
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/Interfaces/IPopupResult.shared.cs
@@ -0,0 +1,21 @@
+namespace CommunityToolkit.Maui.Core;
+
+/// <inheritdoc/>
+public interface IPopupResult<T> : IPopupResult
+{
+	/// <summary>
+	/// PopupResult
+	/// </summary>
+	T? Result { get; }
+}
+
+/// <summary>
+/// Represents the result of a popup.
+/// </summary>
+public interface IPopupResult
+{
+	/// <summary>
+	/// True if Popup is closed by tapping outside the popup
+	/// </summary>
+	bool WasDismissedByTappingOutsideOfPopup { get; }
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Primitives/PopupDismissedEventArgs.shared.cs b/src/CommunityToolkit.Maui.Core/Primitives/PopupDismissedEventArgs.shared.cs
deleted file mode 100644
index 9b7cc8fbdb..0000000000
--- a/src/CommunityToolkit.Maui.Core/Primitives/PopupDismissedEventArgs.shared.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-namespace CommunityToolkit.Maui.Core;
-
-/// <summary>
-/// Popup dismissed event arguments used when a popup is dismissed.
-/// </summary>
-/// <remarks>
-/// Initialization an instance of <see cref="PopupClosedEventArgs"/>.
-/// </remarks>
-/// <param name="result">
-/// The result of the popup.
-/// </param>
-/// <param name="wasDismissedByTappingOutsideOfPopup">
-/// If the popup was dismissed by tapping outside the Popup.
-/// </param>
-public class PopupClosedEventArgs(object? result, bool wasDismissedByTappingOutsideOfPopup)
-{
-	/// <summary>
-	/// The resulting object to return.
-	/// </summary>
-	public object? Result { get; } = result;
-
-	/// <summary>
-	/// If true, then the user tapped outside the bounds of the popup (aka "Light Dismiss").
-	/// If false, then the popup was dismissed by user action or code.
-	/// </summary>
-	public bool WasDismissedByTappingOutsideOfPopup { get; } = wasDismissedByTappingOutsideOfPopup;
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Primitives/PopupOpenedEventArgs.shared.cs b/src/CommunityToolkit.Maui.Core/Primitives/PopupOpenedEventArgs.shared.cs
deleted file mode 100644
index 075fbf40fc..0000000000
--- a/src/CommunityToolkit.Maui.Core/Primitives/PopupOpenedEventArgs.shared.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace CommunityToolkit.Maui.Core;
-
-/// <summary>
-/// Popup opened event arguments used when a popup is opened.
-/// </summary>
-public class PopupOpenedEventArgs : EventArgs
-{
-	/// <summary>
-	/// Empty version of <see cref= "PopupOpenedEventArgs"/>.
-	/// </summary>
-	public static new PopupOpenedEventArgs Empty { get; } = new();
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Views/Popup/MauiPopup.android.cs b/src/CommunityToolkit.Maui.Core/Views/Popup/MauiPopup.android.cs
deleted file mode 100644
index 8586fc9f85..0000000000
--- a/src/CommunityToolkit.Maui.Core/Views/Popup/MauiPopup.android.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using Android.Content;
-using Android.Views;
-using Microsoft.Maui.Platform;
-using AView = Android.Views.View;
-
-namespace CommunityToolkit.Maui.Core.Views;
-
-/// <summary>
-/// The native implementation of Popup control.
-/// </summary>
-public class MauiPopup : Dialog, IDialogInterfaceOnCancelListener
-{
-	readonly IMauiContext mauiContext;
-
-	/// <summary>
-	/// Constructor of <see cref="MauiPopup"/>.
-	/// </summary>
-	/// <param name="context">An instance of <see cref="Context"/>.</param>
-	/// <param name="mauiContext">An instance of <see cref="IMauiContext"/>.</param>
-	/// <exception cref="ArgumentNullException">If <paramref name="mauiContext"/> is null an exception will be thrown. </exception>
-	public MauiPopup(Context context, IMauiContext mauiContext)
-		: base(context)
-	{
-		this.mauiContext = mauiContext ?? throw new ArgumentNullException(nameof(mauiContext));
-	}
-
-	/// <summary>
-	/// An instance of the <see cref="IPopup"/>.
-	/// </summary>
-	public IPopup? VirtualView { get; private set; }
-
-	/// <summary>
-	/// Method to initialize the native implementation.
-	/// </summary>
-	/// <param name="element">An instance of <see cref="IPopup"/>.</param>
-	public AView? SetElement(IPopup? element)
-	{
-		ArgumentNullException.ThrowIfNull(element);
-
-		VirtualView = element;
-
-		if (TryCreateContainer(VirtualView, out var container))
-		{
-			SubscribeEvents();
-		}
-
-		return container;
-	}
-
-	/// <summary>
-	/// Method to show the Popup.
-	/// </summary>
-	public override void Show()
-	{
-		base.Show();
-
-		_ = VirtualView ?? throw new InvalidOperationException($"{nameof(VirtualView)} cannot be null");
-
-		VirtualView.OnOpened();
-	}
-
-	/// <summary>
-	/// Method triggered when the Popup is dismissed by tapping outside of the Popup.
-	/// </summary>
-	/// <param name="dialog">An instance of the <see cref="IDialogInterface"/>.</param>
-	public void OnDismissedByTappingOutsideOfPopup(IDialogInterface dialog)
-	{
-		_ = VirtualView ?? throw new InvalidOperationException($"{nameof(VirtualView)} cannot be null");
-		_ = VirtualView.Handler ?? throw new InvalidOperationException($"{nameof(VirtualView.Handler)} cannot be null");
-
-		VirtualView.Handler?.Invoke(nameof(IPopup.OnDismissedByTappingOutsideOfPopup));
-	}
-
-	/// <summary>
-	/// Method to clean up the resources of the <see cref="MauiPopup"/>.
-	/// </summary>
-	public void CleanUp()
-	{
-		VirtualView = null;
-	}
-
-	/// <inheritdoc/>
-	public override bool OnTouchEvent(MotionEvent e)
-	{
-		if (VirtualView is not null)
-		{
-			if (VirtualView.CanBeDismissedByTappingOutsideOfPopup &&
-				e.Action == MotionEventActions.Up)
-			{
-				if (Window?.DecorView is AView decorView)
-				{
-					float x = e.GetX();
-					float y = e.GetY();
-
-					if (!(x >= 0 && x <= decorView.Width && y >= 0 && y <= decorView.Height))
-					{
-						if (IsShowing)
-						{
-							OnDismissedByTappingOutsideOfPopup(this);
-						}
-					}
-				}
-			}
-		}
-
-		return !this.IsDisposed() && base.OnTouchEvent(e);
-	}
-
-	bool TryCreateContainer(in IPopup popup, [NotNullWhen(true)] out AView? container)
-	{
-		container = null;
-
-		if (popup.Content is null)
-		{
-			return false;
-		}
-
-		container = popup.Content.ToPlatform(mauiContext);
-		SetContentView(container);
-
-		return true;
-	}
-
-	void SubscribeEvents()
-	{
-		SetOnCancelListener(this);
-	}
-
-	void IDialogInterfaceOnCancelListener.OnCancel(IDialogInterface? dialog) => OnDismissedByTappingOutsideOfPopup(this);
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Views/Popup/MauiPopup.macios.cs b/src/CommunityToolkit.Maui.Core/Views/Popup/MauiPopup.macios.cs
deleted file mode 100644
index b93f426cbe..0000000000
--- a/src/CommunityToolkit.Maui.Core/Views/Popup/MauiPopup.macios.cs
+++ /dev/null
@@ -1,236 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using CommunityToolkit.Maui.Core.Extensions;
-using Microsoft.Maui.ApplicationModel;
-using Microsoft.Maui.Handlers;
-
-namespace CommunityToolkit.Maui.Core.Views;
-
-/// <summary>
-/// The native implementation of Popup control.
-/// </summary>
-/// <remarks>
-/// Constructor of <see cref="MauiPopup"/>.
-/// </remarks>
-/// <param name="mauiContext">An instance of <see cref="IMauiContext"/>.</param>
-/// <exception cref="ArgumentNullException">If <paramref name="mauiContext"/> is null an exception will be thrown. </exception>
-public class MauiPopup(IMauiContext mauiContext) : UIViewController
-{
-	readonly IMauiContext mauiContext = mauiContext ?? throw new ArgumentNullException(nameof(mauiContext));
-
-	/// <summary>
-	/// An instance of the <see cref="PageHandler"/> that holds the <see cref="IPopup.Content"/>.
-	/// </summary>
-	public PageHandler? Control { get; private set; }
-
-	/// <summary>
-	/// An instance of the <see cref="IPopup"/>.
-	/// </summary>
-	public IPopup? VirtualView { get; private set; }
-
-	internal UIViewController? ViewController { get; private set; }
-
-	/// <summary>
-	/// Method to update the Popup's size.
-	/// </summary>
-	/// <param name="size"></param>
-	public void SetElementSize(Size size) =>
-		Control?.ContainerView?.SizeThatFits(size);
-
-	/// <inheritdoc/>
-	public override void ViewDidLayoutSubviews()
-	{
-		base.ViewDidLayoutSubviews();
-
-		_ = View ?? throw new InvalidOperationException($"{nameof(View)} cannot be null.");
-		_ = View.Superview ?? throw new InvalidOperationException($"{nameof(View.Superview)} cannot be null.");
-
-		View.Superview.Layer.CornerRadius = 0.0f;
-		View.Superview.Layer.MasksToBounds = false;
-
-		if (PresentationController is not null)
-		{
-			SetShadowView(PresentationController.ContainerView);
-		}
-
-		SetElementSize(new Size(View.Bounds.Width, View.Bounds.Height));
-
-		if (VirtualView is not null)
-		{
-			this.SetSize(VirtualView);
-			this.SetLayout(VirtualView);
-		}
-	}
-
-	/// <inheritdoc/>
-	public override void ViewWillTransitionToSize(CGSize toSize, IUIViewControllerTransitionCoordinator coordinator)
-	{
-		coordinator.AnimateAlongsideTransition(_ =>
-		{
-			// Before screen rotate
-		}, _ =>
-		{
-			// After screen rotate
-			if (VirtualView is not null)
-			{
-				this.SetSize(VirtualView);
-				this.SetLayout(VirtualView);
-			}
-		});
-
-		if (View is not null)
-		{
-			View.Bounds = new CGRect(0, 0, PreferredContentSize.Width, PreferredContentSize.Height);
-		}
-
-		base.ViewWillTransitionToSize(toSize, coordinator);
-	}
-
-	/// <summary>
-	/// Method to initialize the native implementation.
-	/// </summary>
-	/// <param name="element">An instance of <see cref="IPopup"/>.</param>
-	[MemberNotNull(nameof(VirtualView), nameof(ViewController))]
-	public void SetElement(IPopup element)
-	{
-#if MACCATALYST
-		if (element.Parent?.Handler is not PageHandler)
-		{
-			throw new InvalidOperationException($"The {nameof(element.Parent)} must be of type {typeof(PageHandler)}.");
-		}
-#endif
-
-		VirtualView = element;
-		ModalPresentationStyle = UIModalPresentationStyle.Popover;
-
-		_ = View ?? throw new InvalidOperationException($"{nameof(View)} cannot be null.");
-		_ = VirtualView ?? throw new InvalidOperationException($"{nameof(VirtualView)} cannot be null.");
-
-#if MACCATALYST
-		var pageHandler = VirtualView.Parent.Handler as PageHandler;
-		var rootViewController = pageHandler?.ViewController ?? WindowStateManager.Default.GetCurrentUIViewController() ?? throw new InvalidOperationException($"{nameof(PageHandler.ViewController)} cannot be null.");
-#else
-		var rootViewController = WindowStateManager.Default.GetCurrentUIViewController() ?? throw new InvalidOperationException($"{nameof(PageHandler.ViewController)} cannot be null.");
-#endif
-
-		ViewController ??= rootViewController;
-	}
-
-	/// <summary>
-	/// Method to clean up the resources of the <see cref="MauiPopup"/>.
-	/// </summary>
-	public void CleanUp()
-	{
-		if (VirtualView is null)
-		{
-			return;
-		}
-
-		VirtualView = null;
-
-		if (PresentationController is UIPopoverPresentationController presentationController)
-		{
-			presentationController.Delegate = null;
-		}
-	}
-
-	/// <summary>
-	/// 
-	/// </summary>
-	/// <param name="func"></param>
-	/// <param name="virtualView"></param>
-	/// <returns></returns>
-	[MemberNotNull(nameof(Control), nameof(ViewController))]
-	public void CreateControl(Func<IPopup, PageHandler> func, in IPopup virtualView)
-	{
-		Control = func(virtualView);
-
-		SetPresentationController();
-
-		_ = View ?? throw new InvalidOperationException($"{nameof(View)} cannot be null.");
-		SetView(View, Control);
-
-		_ = ViewController ?? throw new InvalidOperationException($"{nameof(ViewController)} cannot be null.");
-		AddToCurrentPageViewController(ViewController);
-
-		this.SetSize(virtualView);
-		this.SetLayout(virtualView);
-	}
-
-	static void SetShadowView(in UIView target)
-	{
-		if (target.Class.Name is "_UICutoutShadowView")
-		{
-			target.RemoveFromSuperview();
-		}
-
-		if (target.Class.Name is "_UIPopoverDimmingView")
-		{
-			target.BackgroundColor = UIColor.Black.ColorWithAlpha(0.4f);
-		}
-
-		foreach (var view in target.Subviews)
-		{
-			SetShadowView(view);
-		}
-	}
-
-	void SetView(UIView view, IPlatformViewHandler control)
-	{
-		view.AddSubview(control.ViewController?.View ?? throw new InvalidOperationException($"{nameof(control.ViewController.View)} cannot be null."));
-		view.Bounds = new CGRect(0, 0, PreferredContentSize.Width, PreferredContentSize.Height);
-		AddChildViewController(control.ViewController);
-
-		view.SafeTopAnchor().ConstraintEqualTo(control.ViewController.View.SafeTopAnchor()).Active = true;
-		view.SafeBottomAnchor().ConstraintEqualTo(control.ViewController.View.SafeBottomAnchor()).Active = true;
-		view.SafeLeadingAnchor().ConstraintEqualTo(control.ViewController.View.SafeLeadingAnchor()).Active = true;
-		view.SafeTrailingAnchor().ConstraintEqualTo(control.ViewController.View.SafeTrailingAnchor()).Active = true;
-
-		if (VirtualView is not null)
-		{
-			this.SetBackgroundColor(VirtualView);
-		}
-	}
-
-	void SetPresentationController()
-	{
-		var popOverDelegate = new PopoverDelegate();
-		popOverDelegate.PopoverDismissedEvent += HandlePopoverDelegateDismissed;
-
-		var presentationController = (UIPopoverPresentationController)(PresentationController ?? throw new InvalidOperationException($"{nameof(PresentationController)} cannot be null."));
-		presentationController.SourceView = ViewController?.View ?? throw new InvalidOperationException($"{nameof(ViewController.View)} cannot be null.");
-
-		presentationController.Delegate = popOverDelegate;
-	}
-
-	[MemberNotNull(nameof(VirtualView))]
-	void HandlePopoverDelegateDismissed(object? sender, UIPresentationController e)
-	{
-		_ = VirtualView ?? throw new InvalidOperationException($"{nameof(VirtualView)} cannot be null.");
-		VirtualView.Handler?.Invoke(nameof(IPopup.OnDismissedByTappingOutsideOfPopup));
-	}
-
-	void AddToCurrentPageViewController(UIViewController viewController)
-	{
-		viewController.PresentViewController(this, true, null);
-	}
-
-	sealed class PopoverDelegate : UIPopoverPresentationControllerDelegate
-	{
-		readonly WeakEventManager popoverDismissedEventManager = new();
-
-		public event EventHandler<UIPresentationController> PopoverDismissedEvent
-		{
-			add => popoverDismissedEventManager.AddEventHandler(value);
-			remove => popoverDismissedEventManager.RemoveEventHandler(value);
-		}
-
-		public override UIModalPresentationStyle GetAdaptivePresentationStyle(UIPresentationController forPresentationController) =>
-			UIModalPresentationStyle.None;
-
-		public override UIModalPresentationStyle GetAdaptivePresentationStyle(UIPresentationController controller, UITraitCollection traitCollection) =>
-			UIModalPresentationStyle.None;
-
-		public override void DidDismiss(UIPresentationController presentationController) =>
-			popoverDismissedEventManager.HandleEvent(this, presentationController, nameof(PopoverDismissedEvent));
-	}
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Views/Popup/MauiPopup.tizen.cs b/src/CommunityToolkit.Maui.Core/Views/Popup/MauiPopup.tizen.cs
deleted file mode 100644
index b6bfa3ef14..0000000000
--- a/src/CommunityToolkit.Maui.Core/Views/Popup/MauiPopup.tizen.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-using Microsoft.Maui.Platform;
-using Microsoft.Maui.Primitives;
-using Tizen.NUI;
-using Tizen.UIExtensions.NUI;
-using NHorizontalAlignment = Tizen.NUI.HorizontalAlignment;
-using NVerticalAlignment = Tizen.NUI.VerticalAlignment;
-
-namespace CommunityToolkit.Maui.Core.Views;
-
-/// <summary>
-/// The native implementation of Popup control.
-/// </summary>
-public class MauiPopup : Popup
-{
-	readonly IMauiContext mauiContext;
-
-	/// <summary>
-	/// Constructor of <see cref="MauiPopup"/>.
-	/// </summary>
-	/// <param name="mauiContext">An instance of <see cref="IMauiContext"/>.</param>
-	/// <exception cref="ArgumentNullException">If <paramref name="mauiContext"/> is null an exception will be thrown. </exception>
-	public MauiPopup(IMauiContext mauiContext)
-	{
-		this.mauiContext = mauiContext ?? throw new ArgumentNullException(nameof(mauiContext));
-		OutsideClicked += OnOutsideClicked;
-	}
-
-	/// <summary>
-	/// An instance of the <see cref="IPopup"/>.
-	/// </summary>
-	public IPopup? VirtualView { get; private set; }
-
-	/// <inheritdoc/>
-	protected override void Dispose(bool isDisposing)
-	{
-		if (isDisposing)
-		{
-			OutsideClicked -= OnOutsideClicked;
-		}
-
-		base.Dispose(isDisposing);
-	}
-
-	/// <summary>
-	/// Method to initialize the native implementation.
-	/// </summary>
-	/// <param name="element">An instance of <see cref="IPopup"/>.</param>
-	public void SetElement(IPopup? element)
-	{
-		VirtualView = element;
-	}
-
-	/// <summary>
-	/// Method to show the Popup
-	/// </summary>
-	public void ShowPopup()
-	{
-		_ = VirtualView ?? throw new InvalidOperationException($"{nameof(VirtualView)} cannot be null");
-		Content = VirtualView.Content?.ToPlatform(mauiContext) ?? throw new InvalidOperationException($"{nameof(VirtualView.Content)} cannot be null");
-
-		BackgroundColor = new Tizen.NUI.Color(0.1f, 0.1f, 0.1f, 0.5f);
-		Content.BackgroundColor = (VirtualView.Color ?? Colors.Transparent).ToNUIColor();
-
-		if (VirtualView.Anchor is not null)
-		{
-			var anchorView = VirtualView.Anchor.ToPlatform();
-			var anchorPosition = anchorView.ScreenPosition;
-			Layout = new AbsoluteLayout();
-			Content.UpdatePosition(new Tizen.UIExtensions.Common.Point(anchorPosition.X, anchorPosition.Y));
-		}
-		else
-		{
-			Layout = new LinearLayout
-			{
-				LinearOrientation = LinearLayout.Orientation.Vertical,
-				VerticalAlignment = ToVerticalAlignment(VirtualView.VerticalOptions),
-				HorizontalAlignment = ToHorizontalAlignment(VirtualView.Content.FlowDirection, VirtualView.HorizontalOptions),
-			};
-			Content.UpdatePosition(new Tizen.UIExtensions.Common.Point(0, 0));
-		}
-
-		UpdateContentSize();
-
-		Open();
-		VirtualView.OnOpened();
-	}
-
-	/// <summary>
-	/// Method to update size of Content
-	/// </summary>
-	/// <exception cref="InvalidOperationException"></exception>
-	public void UpdateContentSize()
-	{
-		_ = VirtualView ?? throw new InvalidOperationException($"{nameof(VirtualView)} cannot be null");
-		if (Content is null)
-		{
-			return;
-		}
-
-		if (VirtualView.Size.Width > 0 && VirtualView.Size.Height > 0)
-		{
-			Content.UpdateSize(VirtualView.Size.ToPixel());
-		}
-		else
-		{
-			var measured = VirtualView.Content?.Measure(double.PositiveInfinity, double.PositiveInfinity).ToPixel() ?? new Tizen.UIExtensions.Common.Size(0, 0);
-			Content.UpdateSize(measured);
-		}
-	}
-
-	static NVerticalAlignment ToVerticalAlignment(LayoutAlignment align) => align switch
-	{
-		LayoutAlignment.Start => NVerticalAlignment.Top,
-		LayoutAlignment.End => NVerticalAlignment.Bottom,
-		_ => NVerticalAlignment.Center
-	};
-
-	static NHorizontalAlignment ToHorizontalAlignment(FlowDirection direction, LayoutAlignment align) => align switch
-	{
-		LayoutAlignment.Start => direction == FlowDirection.RightToLeft ? NHorizontalAlignment.End : NHorizontalAlignment.Begin,
-		LayoutAlignment.End => direction == FlowDirection.RightToLeft ? NHorizontalAlignment.Begin : NHorizontalAlignment.End,
-		_ => NHorizontalAlignment.Center
-	};
-
-	void OnOutsideClicked(object? sender, EventArgs e)
-	{
-		if (VirtualView?.Handler is null)
-		{
-			return;
-		}
-
-		if (VirtualView.CanBeDismissedByTappingOutsideOfPopup)
-		{
-			Close();
-			VirtualView.Handler?.Invoke(nameof(IPopup.OnDismissedByTappingOutsideOfPopup));
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Views/Popup/PopupExtensions.android.cs b/src/CommunityToolkit.Maui.Core/Views/Popup/PopupExtensions.android.cs
deleted file mode 100644
index 097965aa25..0000000000
--- a/src/CommunityToolkit.Maui.Core/Views/Popup/PopupExtensions.android.cs
+++ /dev/null
@@ -1,439 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using Android.Graphics.Drawables;
-using Android.Views;
-using CommunityToolkit.Maui.Core.Handlers;
-using Microsoft.Maui.Platform;
-using static Android.Views.ViewGroup;
-using AColorRes = Android.Resource.Color;
-using APoint = Android.Graphics.Point;
-using AView = Android.Views.View;
-using LayoutAlignment = Microsoft.Maui.Primitives.LayoutAlignment;
-
-namespace CommunityToolkit.Maui.Core.Views;
-
-/// <summary>
-/// Extension class where Helper methods for Popup lives.
-/// </summary>
-public static class PopupExtensions
-{
-	/// <summary>
-	/// Method to update the <see cref="IPopup.Anchor"/> view.
-	/// </summary>
-	/// <param name="dialog">An instance of <see cref="Dialog"/>.</param>
-	/// <param name="popup">An instance of <see cref="IPopup"/>.</param>
-	/// <param name="popupWidth">Width of Popup</param>
-	/// <param name="popupHeight">Height of Popup</param>
-	/// <exception cref="InvalidOperationException">if the <see cref="Window"/> is null an exception will be thrown.</exception>
-	public static void SetAnchor(this Dialog dialog, in IPopup popup, int? popupWidth = null, int? popupHeight = null)
-	{
-		var window = GetWindow(dialog);
-
-		var windowManager = window.WindowManager;
-		var statusBarHeight = GetStatusBarHeight(windowManager);
-		var navigationBarHeight = GetNavigationBarHeight(windowManager);
-		var windowSize = GetWindowSize(windowManager);
-		var rotation = windowManager.DefaultDisplay?.Rotation ?? throw new InvalidOperationException("DefaultDisplay cannot be null");
-		navigationBarHeight = windowSize.Height < windowSize.Width ? (rotation == SurfaceOrientation.Rotation270 ? navigationBarHeight : 0) : 0;
-
-		if (popup.Handler?.MauiContext is null)
-		{
-			return;
-		}
-
-		if (popup.Anchor is not null)
-		{
-			var anchorView = popup.Anchor.ToPlatform();
-
-			var locationOnScreen = new int[2];
-			anchorView.GetLocationOnScreen(locationOnScreen);
-			if (popupWidth is null && popupHeight is null)
-			{
-				window.DecorView.Measure((int)MeasureSpecMode.Unspecified, (int)MeasureSpecMode.Unspecified);
-			}
-
-			// This logic is tricky, please read these notes if you need to modify
-			// Android window coordinate starts (0,0) at the top left and (max,max) at the bottom right. All of the positions
-			// that are being handled in this operation assume the point is at the top left of the rectangle. This means the
-			// calculation operates in this order:
-			// 1. Calculate top-left position of Anchor
-			// 2. Calculate the Actual Center of the Anchor by adding the width /2 and height / 2
-			// 3. Calculate the top-left point of where the dialog should be positioned by subtracting the Width / 2 and height / 2
-			//    of the dialog that is about to be drawn.
-			var attribute = window.Attributes ?? throw new InvalidOperationException($"{nameof(window.Attributes)} cannot be null");
-
-			var newX = locationOnScreen[0] - navigationBarHeight + (anchorView.Width / 2) - (popupWidth == null ? (window.DecorView.Width / 2) : (int)(popupWidth / 2));
-			var newY = locationOnScreen[1] - statusBarHeight + (anchorView.Height / 2) - (popupHeight == null ? (window.DecorView.Height / 2) : (int)(popupHeight / 2));
-
-			if (!(newX == attribute.X &&
-				  newY == attribute.Y))
-			{
-				window.SetGravity(GravityFlags.Top | GravityFlags.Left);
-				attribute.X = newX;
-				attribute.Y = newY;
-				window.Attributes = attribute;
-			}
-		}
-		else
-		{
-			SetDialogPosition(popup, window);
-		}
-	}
-
-	/// <summary>
-	/// Method to update the <see cref="IPopup.Color"/> property.
-	/// </summary>
-	/// <param name="dialog">An instance of <see cref="Dialog"/>.</param>
-	/// <param name="popup">An instance of <see cref="IPopup"/>.</param>
-	public static void SetColor(this Dialog dialog, in IPopup popup)
-	{
-		if (popup.Color is null)
-		{
-			return;
-		}
-
-		var window = GetWindow(dialog);
-		window.SetBackgroundDrawable(new ColorDrawable(popup.Color.ToPlatform(AColorRes.BackgroundLight, dialog.Context)));
-	}
-
-	/// <summary>
-	/// Method to update the <see cref="IPopup.CanBeDismissedByTappingOutsideOfPopup"/> property.
-	/// </summary>
-	/// <param name="dialog">An instance of <see cref="Dialog"/>.</param>
-	/// <param name="popup">An instance of <see cref="IPopup"/>.</param>
-	public static void SetCanBeDismissedByTappingOutsideOfPopup(this Dialog dialog, in IPopup popup)
-	{
-		dialog.SetCancelable(popup.CanBeDismissedByTappingOutsideOfPopup);
-		dialog.SetCanceledOnTouchOutside(popup.CanBeDismissedByTappingOutsideOfPopup);
-	}
-
-	/// <summary>
-	/// Method to update the <see cref="IPopup.Size"/> property.
-	/// </summary>
-	/// <param name="dialog">An instance of <see cref="Dialog"/>.</param>
-	/// <param name="popup">An instance of <see cref="IPopup"/>.</param>
-	/// <param name="container">The native representation of <see cref="IPopup.Content"/>.</param>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <exception cref="InvalidOperationException">if the <see cref="Window"/> is null an exception will be thrown. If the <paramref name="container"/> is null an exception will be thrown.</exception>
-	public static void SetSize(this Dialog dialog, in IPopup popup, in AView container, PopupHandler handler)
-	{
-		ArgumentNullException.ThrowIfNull(dialog);
-		ArgumentNullException.ThrowIfNull(container);
-		ArgumentNullException.ThrowIfNull(popup.Content);
-		ArgumentNullException.ThrowIfNull(handler);
-
-		var window = GetWindow(dialog);
-		var context = dialog.Context;
-		var windowManager = window.WindowManager;
-
-		var decorView = (ViewGroup)window.DecorView;
-
-		var windowSize = GetWindowSize(windowManager);
-		int width = LayoutParams.WrapContent;
-		int height = LayoutParams.WrapContent;
-
-		if (popup.Size.IsZero)
-		{
-			if (double.IsNaN(popup.Content.Width) || double.IsNaN(popup.Content.Height))
-			{
-				if ((handler.LastPopupWidth == decorView.MeasuredWidth
-					&& handler.LastPopupHeight == decorView.MeasuredHeight)
-					&& Math.Abs(handler.LastWindowWidth - windowSize.Width) < 0.01 // Allow for floating point variation 
-					&& Math.Abs(handler.LastWindowHeight - windowSize.Height) < 0.01) // Allow for floating point variation
-				{
-					SetAnchor(dialog, popup, handler.LastPopupWidth, handler.LastPopupHeight);
-					return;
-				}
-
-				decorView.Measure(
-					MeasureSpecMode.AtMost.MakeMeasureSpec((int)windowSize.Width),
-					MeasureSpecMode.AtMost.MakeMeasureSpec((int)windowSize.Height)
-				);
-
-				if (double.IsNaN(popup.Content.Width))
-				{
-					if (popup.HorizontalOptions == LayoutAlignment.Fill)
-					{
-						width = (int)windowSize.Width;
-					}
-					else
-					{
-						if (decorView.MeasuredWidth >= windowSize.Width)
-						{
-							width = (int)windowSize.Width;
-						}
-					}
-				}
-				else
-				{
-					if (context.ToPixels(popup.Content.Width) >= windowSize.Width)
-					{
-						width = (int)windowSize.Width;
-					}
-					else
-					{
-						width = (int)context.ToPixels(popup.Content.Width);
-					}
-				}
-
-				if (double.IsNaN(popup.Content.Height))
-				{
-					if (popup.VerticalOptions == LayoutAlignment.Fill)
-					{
-						height = (int)windowSize.Height;
-					}
-					else
-					{
-						if (decorView.MeasuredHeight >= windowSize.Height)
-						{
-							height = (int)windowSize.Height;
-						}
-					}
-				}
-				else
-				{
-					if (context.ToPixels(popup.Content.Height) >= windowSize.Height)
-					{
-						height = (int)windowSize.Height;
-					}
-					else
-					{
-						height = (int)context.ToPixels(popup.Content.Height);
-					}
-				}
-
-				window.SetLayout(width, height);
-
-				width = width == LayoutParams.WrapContent ? decorView.MeasuredWidth : width;
-				height = height == LayoutParams.WrapContent ? decorView.MeasuredHeight : height;
-			}
-			else
-			{
-				width = (int)context.ToPixels(popup.Content.Width);
-				height = (int)context.ToPixels(popup.Content.Height);
-				width = width > windowSize.Width ? (int)windowSize.Width : width;
-				height = height > windowSize.Height ? (int)windowSize.Height : height;
-
-				if (handler.LastPopupWidth == width
-					&& handler.LastPopupHeight == height
-					&& Math.Abs(handler.LastWindowWidth - windowSize.Width) < 0.01  // Allow for floating point variation 
-					&& Math.Abs(handler.LastWindowHeight - windowSize.Height) < 0.01)// Allow for floating point variation
-				{
-					SetAnchor(dialog, popup, handler.LastPopupWidth, handler.LastPopupHeight);
-					return;
-				}
-
-				window.SetLayout(width, height);
-
-			}
-		}
-		else
-		{
-			width = (int)context.ToPixels(popup.Size.Width);
-			height = (int)context.ToPixels(popup.Size.Height);
-			width = width > windowSize.Width ? (int)windowSize.Width : width;
-			height = height > windowSize.Height ? (int)windowSize.Height : height;
-
-			if (handler.LastPopupWidth == width
-				&& handler.LastPopupHeight == height
-				&& Math.Abs(handler.LastWindowWidth - windowSize.Width) < 0.01  // Allow for floating point variation
-				&& Math.Abs(handler.LastWindowHeight - windowSize.Height) < 0.01)  // Allow for floating point variation
-			{
-				SetAnchor(dialog, popup, handler.LastPopupWidth, handler.LastPopupHeight);
-				return;
-			}
-
-			window.SetLayout(width, height);
-
-		}
-
-		handler.LastPopupWidth = decorView.Width;
-		handler.LastPopupHeight = decorView.Height;
-		handler.LastWindowWidth = windowSize.Width;
-		handler.LastWindowHeight = windowSize.Height;
-
-		SetAnchor(dialog, popup, width, height);
-	}
-
-	static void SetDialogPosition(in IPopup popup, Window window)
-	{
-		var isFlowDirectionRightToLeft = popup.Content?.FlowDirection == FlowDirection.RightToLeft;
-
-		var gravityFlags = popup.VerticalOptions switch
-		{
-			LayoutAlignment.Start => GravityFlags.Top,
-			LayoutAlignment.End => GravityFlags.Bottom,
-			LayoutAlignment.Center or LayoutAlignment.Fill => GravityFlags.CenterVertical,
-			_ => throw new NotSupportedException($"{nameof(IPopup.VerticalOptions)}: {popup.VerticalOptions} is not yet supported")
-		};
-
-		gravityFlags |= popup.HorizontalOptions switch
-		{
-			LayoutAlignment.Start => isFlowDirectionRightToLeft ? GravityFlags.Right : GravityFlags.Left,
-			LayoutAlignment.End => isFlowDirectionRightToLeft ? GravityFlags.Left : GravityFlags.Right,
-			LayoutAlignment.Center or LayoutAlignment.Fill => GravityFlags.CenterHorizontal,
-			_ => throw new NotSupportedException($"{nameof(IPopup.HorizontalOptions)}: {popup.HorizontalOptions} is not yet supported")
-		};
-
-		window.SetGravity(gravityFlags);
-	}
-
-	static Window GetWindow(in Dialog dialog) =>
-		dialog.Window ?? throw new InvalidOperationException($"{nameof(Dialog)}.{nameof(Dialog.Window)} cannot be null");
-
-	static Size GetWindowSize([NotNull] IWindowManager? windowManager)
-	{
-		ArgumentNullException.ThrowIfNull(windowManager);
-
-		int windowWidth;
-		int windowHeight;
-		int statusBarHeight;
-		int navigationBarHeight;
-
-		if (OperatingSystem.IsAndroidVersionAtLeast(30))
-		{
-			var windowMetrics = windowManager.CurrentWindowMetrics;
-			var windowInsets = windowMetrics.WindowInsets.GetInsetsIgnoringVisibility(WindowInsets.Type.SystemBars());
-			windowWidth = windowMetrics.Bounds.Width();
-			windowHeight = windowMetrics.Bounds.Height();
-			statusBarHeight = windowInsets.Top;
-			navigationBarHeight = windowHeight < windowWidth ? windowInsets.Left + windowInsets.Right : windowInsets.Bottom;
-		}
-		else if (windowManager.DefaultDisplay is null)
-		{
-			throw new InvalidOperationException($"{nameof(IWindowManager)}.{nameof(IWindowManager.DefaultDisplay)} cannot be null");
-		}
-		else
-		{
-			APoint realSize = new();
-			APoint displaySize = new();
-			APoint displaySmallSize = new();
-			APoint displayLargeSize = new();
-
-			windowManager.DefaultDisplay.GetRealSize(realSize);
-			ArgumentNullException.ThrowIfNull(realSize);
-
-			windowManager.DefaultDisplay.GetSize(displaySize);
-			ArgumentNullException.ThrowIfNull(displaySize);
-
-			windowManager.DefaultDisplay.GetCurrentSizeRange(displaySmallSize, displayLargeSize);
-			ArgumentNullException.ThrowIfNull(displaySmallSize);
-			ArgumentNullException.ThrowIfNull(displayLargeSize);
-
-			windowWidth = realSize.X;
-			windowHeight = realSize.Y;
-
-			if (displaySize.X > displaySize.Y)
-			{
-				statusBarHeight = displaySize.Y - displaySmallSize.Y;
-			}
-			else
-			{
-				statusBarHeight = displaySize.Y - displayLargeSize.Y;
-			}
-
-			navigationBarHeight = realSize.Y < realSize.X
-									? (realSize.X - displaySize.X)
-									: (realSize.Y - displaySize.Y);
-		}
-
-		windowWidth -= windowHeight < windowWidth
-			? navigationBarHeight
-			: 0;
-
-		windowHeight -= (windowHeight < windowWidth
-			? 0
-			: navigationBarHeight)
-			+ statusBarHeight;
-
-		return new Size(windowWidth, windowHeight);
-	}
-
-	static int GetNavigationBarHeight(IWindowManager? windowManager)
-	{
-		ArgumentNullException.ThrowIfNull(windowManager);
-
-		int navigationBarHeight;
-
-		if (OperatingSystem.IsAndroidVersionAtLeast(30))
-		{
-			var windowMetrics = windowManager.CurrentWindowMetrics;
-			var windowInsets = windowMetrics.WindowInsets.GetInsetsIgnoringVisibility(WindowInsets.Type.SystemBars());
-			var windowWidth = windowMetrics.Bounds.Width();
-			var windowHeight = windowMetrics.Bounds.Height();
-			navigationBarHeight = windowHeight < windowWidth ? windowInsets.Left + windowInsets.Right : windowInsets.Bottom;
-		}
-		else if (windowManager.DefaultDisplay is null)
-		{
-			throw new InvalidOperationException($"{nameof(IWindowManager)}.{nameof(IWindowManager.DefaultDisplay)} cannot be null");
-		}
-		else
-		{
-			APoint realSize = new();
-			APoint displaySize = new();
-			APoint displaySmallSize = new();
-			APoint displayLargeSize = new();
-
-			windowManager.DefaultDisplay.GetRealSize(realSize);
-			ArgumentNullException.ThrowIfNull(realSize);
-
-			windowManager.DefaultDisplay.GetSize(displaySize);
-			ArgumentNullException.ThrowIfNull(displaySize);
-
-			windowManager.DefaultDisplay.GetCurrentSizeRange(displaySmallSize, displayLargeSize);
-			ArgumentNullException.ThrowIfNull(displaySmallSize);
-			ArgumentNullException.ThrowIfNull(displayLargeSize);
-
-			navigationBarHeight = realSize.Y < realSize.X
-									? (realSize.X - displaySize.X)
-									: (realSize.Y - displaySize.Y);
-		}
-
-		return navigationBarHeight;
-	}
-
-	static int GetStatusBarHeight(IWindowManager? windowManager)
-	{
-		ArgumentNullException.ThrowIfNull(windowManager);
-
-		int statusBarHeight;
-
-		if (OperatingSystem.IsAndroidVersionAtLeast(30))
-		{
-			var windowMetrics = windowManager.CurrentWindowMetrics;
-			var windowInsets = windowMetrics.WindowInsets.GetInsetsIgnoringVisibility(WindowInsets.Type.SystemBars());
-			statusBarHeight = windowInsets.Top;
-		}
-		else if (windowManager.DefaultDisplay is null)
-		{
-			throw new InvalidOperationException($"{nameof(IWindowManager)}.{nameof(IWindowManager.DefaultDisplay)} cannot be null");
-		}
-		else
-		{
-			APoint realSize = new();
-			APoint displaySize = new();
-			APoint displaySmallSize = new();
-			APoint displayLargeSize = new();
-
-			windowManager.DefaultDisplay.GetRealSize(realSize);
-			ArgumentNullException.ThrowIfNull(realSize);
-
-			windowManager.DefaultDisplay.GetSize(displaySize);
-			ArgumentNullException.ThrowIfNull(displaySize);
-
-			windowManager.DefaultDisplay.GetCurrentSizeRange(displaySmallSize, displayLargeSize);
-			ArgumentNullException.ThrowIfNull(displaySmallSize);
-			ArgumentNullException.ThrowIfNull(displayLargeSize);
-
-			if (displaySize.X > displaySize.Y)
-			{
-				statusBarHeight = displaySize.Y - displaySmallSize.Y;
-			}
-			else
-			{
-				statusBarHeight = displaySize.Y - displayLargeSize.Y;
-			}
-		}
-
-		return statusBarHeight;
-	}
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Views/Popup/PopupExtensions.macios.cs b/src/CommunityToolkit.Maui.Core/Views/Popup/PopupExtensions.macios.cs
deleted file mode 100644
index b314449730..0000000000
--- a/src/CommunityToolkit.Maui.Core/Views/Popup/PopupExtensions.macios.cs
+++ /dev/null
@@ -1,250 +0,0 @@
-using Microsoft.Maui.Platform;
-using ObjCRuntime;
-
-namespace CommunityToolkit.Maui.Core.Views;
-/// <summary>
-/// Extension class where Helper methods for Popup lives.
-/// </summary>
-public static class PopupExtensions
-{
-	static readonly nfloat defaultPopoverLayoutMargin = 0.0001f;
-
-#if MACCATALYST
-	// https://github.com/CommunityToolkit/Maui/pull/1361#issuecomment-1736487174
-	static nfloat popupMargin = 18f;
-#endif
-
-
-	/// <summary>
-	/// Method to update the <see cref="IPopup.Size"/> of the Popup.
-	/// </summary>
-	/// <param name="mauiPopup">An instance of <see cref="MauiPopup"/>.</param>
-	/// <param name="popup">An instance of <see cref="IPopup"/>.</param>
-	public static void SetSize(this MauiPopup mauiPopup, in IPopup popup)
-	{
-		ArgumentNullException.ThrowIfNull(popup.Content);
-
-		CGRect frame;
-
-		if (mauiPopup.ViewController?.View?.Window is UIWindow window)
-		{
-			frame = window.Frame;
-		}
-		else
-		{
-			frame = UIScreen.MainScreen.Bounds;
-		}
-
-		CGSize currentSize;
-
-		if (popup.Size.IsZero)
-		{
-			if (double.IsNaN(popup.Content.Width) || double.IsNaN(popup.Content.Height))
-			{
-				var content = popup.Content.ToPlatform(popup.Handler?.MauiContext ?? throw new InvalidOperationException($"{nameof(popup.Handler.MauiContext)} Cannot Be Null"));
-				var contentSize = content.SizeThatFits(new CGSize(double.IsNaN(popup.Content.Width) ? frame.Width : popup.Content.Width, double.IsNaN(popup.Content.Height) ? frame.Height : popup.Content.Height));
-				var width = contentSize.Width;
-				var height = contentSize.Height;
-
-				if (double.IsNaN(popup.Content.Width))
-				{
-					width = popup.HorizontalOptions == Microsoft.Maui.Primitives.LayoutAlignment.Fill ? frame.Size.Width : width;
-				}
-				if (double.IsNaN(popup.Content.Height))
-				{
-					height = popup.VerticalOptions == Microsoft.Maui.Primitives.LayoutAlignment.Fill ? frame.Size.Height : height;
-				}
-
-				currentSize = new CGSize(width, height);
-			}
-			else
-			{
-				currentSize = new CGSize(popup.Content.Width, popup.Content.Height);
-			}
-		}
-		else
-		{
-			currentSize = new CGSize(popup.Size.Width, popup.Size.Height);
-		}
-
-#if MACCATALYST
-		currentSize.Width = NMath.Min(currentSize.Width, frame.Size.Width - defaultPopoverLayoutMargin * 2 - popupMargin * 2);
-		currentSize.Height = NMath.Min(currentSize.Height, frame.Size.Height - defaultPopoverLayoutMargin * 2 - popupMargin * 2);
-#else
-		currentSize.Width = NMath.Min(currentSize.Width, frame.Size.Width);
-		currentSize.Height = NMath.Min(currentSize.Height, frame.Size.Height);
-#endif
-		mauiPopup.PreferredContentSize = currentSize;
-	}
-
-	/// <summary>
-	/// Method to update the <see cref="IPopup.Color"/> of the Popup.
-	/// </summary>
-	/// <param name="mauiPopup">An instance of <see cref="MauiPopup"/>.</param>
-	/// <param name="popup">An instance of <see cref="IPopup"/>.</param>
-	public static void SetBackgroundColor(this MauiPopup mauiPopup, in IPopup popup)
-	{
-		if (mauiPopup.PopoverPresentationController is not null && Equals(popup.Color, Colors.Transparent))
-		{
-			mauiPopup.PopoverPresentationController.PopoverBackgroundViewType = typeof(TransparentPopoverBackgroundView);
-		}
-
-		if (mauiPopup.Control is null)
-		{
-			return;
-		}
-
-		var color = popup.Color?.ToPlatform();
-		mauiPopup.Control.PlatformView.BackgroundColor = color;
-
-		if (mauiPopup.Control.ViewController?.View is UIView view)
-		{
-			view.BackgroundColor = color;
-		}
-	}
-
-	/// <summary>
-	/// Method to update the <see cref="IPopup.CanBeDismissedByTappingOutsideOfPopup"/> property of the Popup.
-	/// </summary>
-	/// <param name="mauiPopup">An instance of <see cref="MauiPopup"/>.</param>
-	/// <param name="popup">An instance of <see cref="IPopup"/>.</param>
-	public static void SetCanBeDismissedByTappingOutsideOfPopup(this MauiPopup mauiPopup, in IPopup popup)
-	{
-		if (OperatingSystem.IsIOSVersionAtLeast(13))
-		{
-			mauiPopup.ModalInPresentation = !popup.CanBeDismissedByTappingOutsideOfPopup;
-		}
-	}
-
-	/// <summary>
-	/// Method to update the layout of the Popup and <see cref="IPopup.Content"/>.
-	/// </summary>
-	/// <param name="mauiPopup">An instance of <see cref="MauiPopup"/>.</param>
-	/// <param name="popup">An instance of <see cref="IPopup"/>.</param>
-	public static void SetLayout(this MauiPopup mauiPopup, in IPopup popup)
-	{
-		if (mauiPopup.View is null)
-		{
-			return;
-		}
-
-		CGRect frame;
-
-		if (mauiPopup.ViewController?.View?.Window is UIWindow window)
-		{
-			frame = window.Frame;
-		}
-		else
-		{
-			frame = UIScreen.MainScreen.Bounds;
-		}
-
-		if (mauiPopup.PopoverPresentationController is null)
-		{
-			throw new InvalidOperationException("PopoverPresentationController cannot be null");
-		}
-
-#if MACCATALYST
-		var titleBarHeight = mauiPopup.ViewController?.NavigationController?.NavigationBar.Frame.Y ?? 0;
-		var navigationBarHeight = mauiPopup.ViewController?.NavigationController?.NavigationBar.Frame.Size.Height ?? 0;
-#endif
-
-		if (popup.Anchor is null)
-		{
-			var isFlowDirectionRightToLeft = popup.Content?.FlowDirection == FlowDirection.RightToLeft;
-			var horizontalOptionsPositiveNegativeMultiplier = isFlowDirectionRightToLeft ? (nfloat)(-1) : (nfloat)1;
-
-			nfloat originY;
-			if (mauiPopup.PreferredContentSize.Height < frame.Height)
-			{
-				originY = popup.VerticalOptions switch
-				{
-#if MACCATALYST
-					Microsoft.Maui.Primitives.LayoutAlignment.Start => mauiPopup.PreferredContentSize.Height / 2 - (titleBarHeight + navigationBarHeight - popupMargin),
-					Microsoft.Maui.Primitives.LayoutAlignment.End => frame.Height - mauiPopup.PreferredContentSize.Height / 2 - (titleBarHeight + navigationBarHeight + popupMargin),
-					Microsoft.Maui.Primitives.LayoutAlignment.Center or Microsoft.Maui.Primitives.LayoutAlignment.Fill => frame.GetMidY() - (titleBarHeight + navigationBarHeight),
-#else
-					Microsoft.Maui.Primitives.LayoutAlignment.Start => mauiPopup.PreferredContentSize.Height / 2,
-					Microsoft.Maui.Primitives.LayoutAlignment.End => frame.Height - (mauiPopup.PreferredContentSize.Height / 2),
-					Microsoft.Maui.Primitives.LayoutAlignment.Center or Microsoft.Maui.Primitives.LayoutAlignment.Fill => frame.GetMidY(),
-#endif
-					_ => throw new NotSupportedException($"{nameof(Microsoft.Maui.Primitives.LayoutAlignment)} {popup.VerticalOptions} is not yet supported")
-				};
-			}
-			else
-			{
-				originY = -frame.GetMidY();
-			}
-
-			nfloat originX;
-			if (mauiPopup.PreferredContentSize.Width < frame.Width)
-			{
-				originX = popup.HorizontalOptions switch
-				{
-#if MACCATALYST
-					Microsoft.Maui.Primitives.LayoutAlignment.Start => (frame.Width - frame.Width * horizontalOptionsPositiveNegativeMultiplier) / 2 - (mauiPopup.PreferredContentSize.Width - mauiPopup.PreferredContentSize.Width * horizontalOptionsPositiveNegativeMultiplier) / 2 - (popupMargin - popupMargin * horizontalOptionsPositiveNegativeMultiplier),
-					Microsoft.Maui.Primitives.LayoutAlignment.End => (frame.Width + frame.Width * horizontalOptionsPositiveNegativeMultiplier) / 2 - (mauiPopup.PreferredContentSize.Width + mauiPopup.PreferredContentSize.Width * horizontalOptionsPositiveNegativeMultiplier) / 2 - (popupMargin + popupMargin * horizontalOptionsPositiveNegativeMultiplier),
-					Microsoft.Maui.Primitives.LayoutAlignment.Center or Microsoft.Maui.Primitives.LayoutAlignment.Fill => frame.GetMidX() - mauiPopup.PreferredContentSize.Width / 2 - popupMargin,
-#else
-					Microsoft.Maui.Primitives.LayoutAlignment.Start => (frame.Width - frame.Width * horizontalOptionsPositiveNegativeMultiplier) / 2 - (mauiPopup.PreferredContentSize.Width / 2 - mauiPopup.PreferredContentSize.Width / 2 * horizontalOptionsPositiveNegativeMultiplier) / 2,
-					Microsoft.Maui.Primitives.LayoutAlignment.End => (frame.Width + frame.Width * horizontalOptionsPositiveNegativeMultiplier) / 2 - (mauiPopup.PreferredContentSize.Width / 2 + mauiPopup.PreferredContentSize.Width / 2 * horizontalOptionsPositiveNegativeMultiplier) / 2,
-					Microsoft.Maui.Primitives.LayoutAlignment.Center or Microsoft.Maui.Primitives.LayoutAlignment.Fill => frame.GetMidX(),
-#endif
-					_ => throw new NotSupportedException($"{nameof(Microsoft.Maui.Primitives.LayoutAlignment)} {popup.VerticalOptions} is not yet supported")
-				};
-			}
-			else
-			{
-				originX = -frame.GetMidX();
-			}
-
-			if (mauiPopup.ViewController?.PopoverPresentationController is UIPopoverPresentationController popoverPresentationController)
-			{
-				mauiPopup.PopoverPresentationController.SourceView = popoverPresentationController.SourceView;
-			}
-			mauiPopup.PopoverPresentationController.SourceRect = new CGRect(originX, originY, 0, 0);
-			mauiPopup.PopoverPresentationController.PermittedArrowDirections = 0;
-			// From the point of view of usability, the top, bottom, left, and right values of UIEdgeInsets cannot all be 0.
-			// If you specify 0 for the top, bottom, left, and right of UIEdgeInsets, the default margins will be added, so 
-			// specify a value as close to 0 here as possible.
-			mauiPopup.PopoverPresentationController.PopoverLayoutMargins = new UIEdgeInsets(defaultPopoverLayoutMargin, defaultPopoverLayoutMargin, defaultPopoverLayoutMargin, defaultPopoverLayoutMargin);
-		}
-		else
-		{
-			var view = popup.Anchor.ToPlatform(popup.Handler?.MauiContext ?? throw new InvalidOperationException($"{nameof(popup.Handler.MauiContext)} Cannot Be Null"));
-			mauiPopup.PopoverPresentationController.SourceView = view;
-			mauiPopup.PopoverPresentationController.SourceRect = view.Bounds;
-		}
-	}
-
-	sealed class TransparentPopoverBackgroundView : UIPopoverBackgroundView
-	{
-		public TransparentPopoverBackgroundView(IntPtr handle) : base(handle)
-		{
-			BackgroundColor = Colors.Transparent.ToPlatform();
-			Alpha = 0.0f;
-		}
-
-		public override nfloat ArrowOffset { get; set; }
-
-		public override UIPopoverArrowDirection ArrowDirection { get; set; }
-
-		[Export("arrowHeight")]
-		static new float GetArrowHeight()
-		{
-			return 0f;
-		}
-
-		[Export("arrowBase")]
-		static new float GetArrowBase()
-		{
-			return 0f;
-		}
-
-		[Export("contentViewInsets")]
-		static new UIEdgeInsets GetContentViewInsets()
-		{
-			return UIEdgeInsets.Zero;
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Views/Popup/PopupExtensions.windows.cs b/src/CommunityToolkit.Maui.Core/Views/Popup/PopupExtensions.windows.cs
deleted file mode 100644
index 19b9ec17c4..0000000000
--- a/src/CommunityToolkit.Maui.Core/Views/Popup/PopupExtensions.windows.cs
+++ /dev/null
@@ -1,265 +0,0 @@
-using CommunityToolkit.Maui.Core.Handlers;
-using Microsoft.Maui.Platform;
-using Microsoft.Maui.Primitives;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-
-namespace CommunityToolkit.Maui.Core.Views;
-
-/// <summary>
-/// Extension class where Helper methods for Popup lives.
-/// </summary>
-public static class PopupExtensions
-{
-	/// <summary>
-	/// Method to update the <see cref="Maui.Core.IPopup.Content"/> based on the <see cref="Maui.Core.IPopup.Color"/>.
-	/// </summary>
-	/// <param name="mauiPopup">An instance of <see cref="Popup"/>.</param>
-	/// <param name="popup">An instance of <see cref="Maui.Core.IPopup"/>.</param>
-	public static void SetColor(this Popup mauiPopup, IPopup popup)
-	{
-		ArgumentNullException.ThrowIfNull(popup.Content);
-
-		var color = popup.Color ?? Colors.Transparent;
-		if (mauiPopup.Child is Panel panel)
-		{
-			panel.Background = color.ToPlatform();
-		}
-	}
-
-	/// <summary>
-	/// Method to update the popup anchor based on the <see cref="Maui.Core.IPopup.Anchor"/>.
-	/// </summary>
-	/// <param name="mauiPopup">An instance of <see cref="Popup"/>.</param>
-	/// <param name="popup">An instance of <see cref="IPopup"/>.</param>
-	/// <param name="mauiContext">An instance of <see cref="IMauiContext"/>.</param>
-	public static void SetAnchor(this Popup mauiPopup, IPopup popup, IMauiContext? mauiContext)
-	{
-		ArgumentNullException.ThrowIfNull(mauiContext);
-		mauiPopup.PlacementTarget = popup.Anchor?.ToPlatform(mauiContext);
-	}
-
-	/// <summary>
-	///  Method to prepare control.
-	/// </summary>
-	/// <param name="mauiPopup">An instance of <see cref="Popup"/>.</param>
-	/// <param name="popup">An instance of <see cref="IPopup"/>.</param>
-	/// <param name="mauiContext">An instance of <see cref="IMauiContext"/>.</param>
-	public static void ConfigureControl(this Popup mauiPopup, IPopup popup, IMauiContext? mauiContext)
-	{
-		ArgumentNullException.ThrowIfNull(mauiContext);
-		if (popup.Content is not null && popup.Handler is PopupHandler handler)
-		{
-			mauiPopup.Child = handler.VirtualView.Content?.ToPlatform(mauiContext);
-		}
-
-		mauiPopup.SetSize(popup, mauiContext);
-		mauiPopup.SetLayout(popup, mauiContext);
-	}
-
-	/// <summary>
-	/// Method to update the popup size based on the <see cref="Maui.Core.IPopup.Size"/>.
-	/// </summary>
-	/// <param name="mauiPopup">An instance of <see cref="Popup"/>.</param>
-	/// <param name="popup">An instance of <see cref="IPopup"/>.</param>
-	/// <param name="mauiContext">An instance of <see cref="IMauiContext"/>.</param>
-	public static void SetSize(this Popup mauiPopup, IPopup popup, IMauiContext? mauiContext)
-	{
-		ArgumentNullException.ThrowIfNull(mauiContext);
-		ArgumentNullException.ThrowIfNull(popup.Content);
-
-		const double defaultBorderThickness = 0;
-		const double defaultSize = 600;
-
-		var popupParent = mauiContext.GetPlatformWindow();
-		var currentSize = new Size { Width = defaultSize, Height = defaultSize / 2 };
-
-		if (popup.Size.IsZero)
-		{
-			if (double.IsNaN(popup.Content.Width) || (double.IsNaN(popup.Content.Height)))
-			{
-				currentSize = popup.Content.Measure(double.IsNaN(popup.Content.Width) ? popupParent.Bounds.Width : popup.Content.Width, double.IsNaN(popup.Content.Height) ? popupParent.Bounds.Height : popup.Content.Height);
-
-				if (double.IsNaN(popup.Content.Width))
-				{
-					currentSize.Width = popup.HorizontalOptions == LayoutAlignment.Fill ? popupParent.Bounds.Width : currentSize.Width;
-				}
-				if (double.IsNaN(popup.Content.Height))
-				{
-					currentSize.Height = popup.VerticalOptions == LayoutAlignment.Fill ? popupParent.Bounds.Height : currentSize.Height;
-				}
-			}
-			else
-			{
-				currentSize.Width = popup.Content.Width;
-				currentSize.Height = popup.Content.Height;
-			}
-		}
-		else
-		{
-			currentSize.Width = popup.Size.Width;
-			currentSize.Height = popup.Size.Height;
-		}
-
-		currentSize.Width = Math.Min(currentSize.Width, popupParent.Bounds.Width);
-		currentSize.Height = Math.Min(currentSize.Height, popupParent.Bounds.Height);
-
-		mauiPopup.Width = currentSize.Width;
-		mauiPopup.Height = currentSize.Height;
-		mauiPopup.MinWidth = mauiPopup.MaxWidth = currentSize.Width + (defaultBorderThickness * 2);
-		mauiPopup.MinHeight = mauiPopup.MaxHeight = currentSize.Height + (defaultBorderThickness * 2);
-
-		if (mauiPopup.Child is FrameworkElement control)
-		{
-			control.Width = mauiPopup.Width;
-			control.Height = mauiPopup.Height;
-		}
-	}
-
-	/// <summary>
-	///  Method to update the popup layout.
-	/// </summary>
-	/// <param name="mauiPopup">An instance of <see cref="Popup"/>.</param>
-	/// <param name="popup">An instance of <see cref="IPopup"/>.</param>
-	/// <param name="mauiContext">An instance of <see cref="IMauiContext"/>.</param>
-	public static void SetLayout(this Popup mauiPopup, IPopup popup, IMauiContext? mauiContext)
-	{
-		ArgumentNullException.ThrowIfNull(mauiContext);
-		ArgumentNullException.ThrowIfNull(popup.Content);
-
-		var popupParent = mauiContext.GetPlatformWindow();
-		popup.Content.Measure(double.PositiveInfinity, double.PositiveInfinity);
-		var contentSize = popup.Content.ToPlatform(mauiContext).DesiredSize;
-		var popupParentFrame = popupParent.Bounds;
-
-		var isFlowDirectionRightToLeft = popup.Content?.FlowDirection == Microsoft.Maui.FlowDirection.RightToLeft;
-		var horizontalOptionsPositiveNegativeMultiplier = isFlowDirectionRightToLeft ? -1 : 1;
-
-		var verticalOptions = popup.VerticalOptions;
-		var horizontalOptions = popup.HorizontalOptions;
-		if (popup.Anchor is not null)
-		{
-			mauiPopup.DesiredPlacement = PopupPlacementMode.Top;
-		}
-		else if (IsTopLeft(verticalOptions, horizontalOptions))
-		{
-			mauiPopup.DesiredPlacement = PopupPlacementMode.TopEdgeAlignedLeft;
-			mauiPopup.HorizontalOffset = (popupParentFrame.Width - popupParentFrame.Width * horizontalOptionsPositiveNegativeMultiplier) / 2;
-			mauiPopup.VerticalOffset = 0;
-		}
-		else if (IsTop(verticalOptions, horizontalOptions))
-		{
-			mauiPopup.DesiredPlacement = PopupPlacementMode.Top;
-			mauiPopup.HorizontalOffset = (popupParentFrame.Width - contentSize.Width * horizontalOptionsPositiveNegativeMultiplier) / 2;
-			mauiPopup.VerticalOffset = 0;
-		}
-		else if (IsTopRight(verticalOptions, horizontalOptions))
-		{
-			mauiPopup.DesiredPlacement = PopupPlacementMode.TopEdgeAlignedRight;
-			mauiPopup.HorizontalOffset = (popupParentFrame.Width + popupParentFrame.Width * horizontalOptionsPositiveNegativeMultiplier) / 2 - contentSize.Width * horizontalOptionsPositiveNegativeMultiplier;
-			mauiPopup.VerticalOffset = 0;
-		}
-		else if (IsRight(verticalOptions, horizontalOptions))
-		{
-			mauiPopup.DesiredPlacement = PopupPlacementMode.Right;
-			mauiPopup.HorizontalOffset = (popupParentFrame.Width + popupParentFrame.Width * horizontalOptionsPositiveNegativeMultiplier) / 2 - contentSize.Width * horizontalOptionsPositiveNegativeMultiplier;
-			mauiPopup.VerticalOffset = (popupParentFrame.Height - contentSize.Height) / 2;
-		}
-		else if (IsBottomRight(verticalOptions, horizontalOptions))
-		{
-			mauiPopup.DesiredPlacement = PopupPlacementMode.BottomEdgeAlignedRight;
-			mauiPopup.HorizontalOffset = (popupParentFrame.Width + popupParentFrame.Width * horizontalOptionsPositiveNegativeMultiplier) / 2 - contentSize.Width * horizontalOptionsPositiveNegativeMultiplier;
-			mauiPopup.VerticalOffset = popupParentFrame.Height - contentSize.Height;
-		}
-		else if (IsBottom(verticalOptions, horizontalOptions))
-		{
-			mauiPopup.DesiredPlacement = PopupPlacementMode.Bottom;
-			mauiPopup.HorizontalOffset = (popupParentFrame.Width - contentSize.Width * horizontalOptionsPositiveNegativeMultiplier) / 2;
-			mauiPopup.VerticalOffset = popupParentFrame.Height - contentSize.Height;
-		}
-		else if (IsBottomLeft(verticalOptions, horizontalOptions))
-		{
-			mauiPopup.DesiredPlacement = PopupPlacementMode.BottomEdgeAlignedLeft;
-			mauiPopup.HorizontalOffset = (popupParentFrame.Width - popupParentFrame.Width * horizontalOptionsPositiveNegativeMultiplier) / 2;
-			mauiPopup.VerticalOffset = popupParentFrame.Height - contentSize.Height;
-		}
-		else if (IsLeft(verticalOptions, horizontalOptions))
-		{
-			mauiPopup.DesiredPlacement = PopupPlacementMode.Left;
-			mauiPopup.HorizontalOffset = (popupParentFrame.Width - popupParentFrame.Width * horizontalOptionsPositiveNegativeMultiplier) / 2;
-			mauiPopup.VerticalOffset = (popupParentFrame.Height - contentSize.Height) / 2;
-		}
-		else if (IsCenter(verticalOptions, horizontalOptions))
-		{
-			mauiPopup.DesiredPlacement = PopupPlacementMode.Auto;
-			mauiPopup.HorizontalOffset = (popupParentFrame.Width - contentSize.Width * horizontalOptionsPositiveNegativeMultiplier) / 2;
-			mauiPopup.VerticalOffset = (popupParentFrame.Height - contentSize.Height) / 2;
-		}
-		else if (IsFillLeft(verticalOptions, horizontalOptions))
-		{
-			mauiPopup.DesiredPlacement = PopupPlacementMode.Auto;
-			mauiPopup.HorizontalOffset = (popupParentFrame.Width - popupParentFrame.Width * horizontalOptionsPositiveNegativeMultiplier) / 2;
-			mauiPopup.VerticalOffset = (popupParentFrame.Height - contentSize.Height) / 2;
-		}
-		else if (IsFillCenter(verticalOptions, horizontalOptions))
-		{
-			mauiPopup.DesiredPlacement = PopupPlacementMode.Auto;
-			mauiPopup.HorizontalOffset = (popupParentFrame.Width - contentSize.Width * horizontalOptionsPositiveNegativeMultiplier) / 2;
-			mauiPopup.VerticalOffset = (popupParentFrame.Height - contentSize.Height) / 2;
-		}
-		else if (IsFillRight(verticalOptions, horizontalOptions))
-		{
-			mauiPopup.DesiredPlacement = PopupPlacementMode.Auto;
-			mauiPopup.HorizontalOffset = (popupParentFrame.Width + popupParentFrame.Width * horizontalOptionsPositiveNegativeMultiplier) / 2 - contentSize.Width * horizontalOptionsPositiveNegativeMultiplier;
-			mauiPopup.VerticalOffset = (popupParentFrame.Height - contentSize.Height) / 2;
-		}
-		else if (IsTopFill(verticalOptions, horizontalOptions))
-		{
-			mauiPopup.DesiredPlacement = PopupPlacementMode.Auto;
-			mauiPopup.HorizontalOffset = (popupParentFrame.Width - contentSize.Width * horizontalOptionsPositiveNegativeMultiplier) / 2;
-			mauiPopup.VerticalOffset = 0;
-		}
-		else if (IsCenterFill(verticalOptions, horizontalOptions))
-		{
-			mauiPopup.DesiredPlacement = PopupPlacementMode.Auto;
-			mauiPopup.HorizontalOffset = (popupParentFrame.Width - contentSize.Width * horizontalOptionsPositiveNegativeMultiplier) / 2;
-			mauiPopup.VerticalOffset = (popupParentFrame.Height - contentSize.Height) / 2;
-		}
-		else if (IsBottomFill(verticalOptions, horizontalOptions))
-		{
-			mauiPopup.DesiredPlacement = PopupPlacementMode.Auto;
-			mauiPopup.HorizontalOffset = (popupParentFrame.Width - contentSize.Width * horizontalOptionsPositiveNegativeMultiplier) / 2;
-			mauiPopup.VerticalOffset = popupParentFrame.Height - contentSize.Height;
-		}
-		else if (IsFill(verticalOptions, horizontalOptions))
-		{
-			mauiPopup.DesiredPlacement = PopupPlacementMode.Auto;
-			mauiPopup.HorizontalOffset = (popupParentFrame.Width - contentSize.Width * horizontalOptionsPositiveNegativeMultiplier) / 2;
-			mauiPopup.VerticalOffset = (popupParentFrame.Height - contentSize.Height) / 2;
-		}
-		else
-		{
-			mauiPopup.DesiredPlacement = PopupPlacementMode.Auto;
-			mauiPopup.HorizontalOffset = (popupParentFrame.Width - contentSize.Width * horizontalOptionsPositiveNegativeMultiplier) / 2;
-			mauiPopup.VerticalOffset = (popupParentFrame.Height - contentSize.Height) / 2;
-		}
-
-		static bool IsTopLeft(LayoutAlignment verticalOptions, LayoutAlignment horizontalOptions) => verticalOptions == LayoutAlignment.Start && horizontalOptions == LayoutAlignment.Start;
-		static bool IsTop(LayoutAlignment verticalOptions, LayoutAlignment horizontalOptions) => verticalOptions == LayoutAlignment.Start && horizontalOptions == LayoutAlignment.Center;
-		static bool IsTopRight(LayoutAlignment verticalOptions, LayoutAlignment horizontalOptions) => verticalOptions == LayoutAlignment.Start && horizontalOptions == LayoutAlignment.End;
-		static bool IsRight(LayoutAlignment verticalOptions, LayoutAlignment horizontalOptions) => verticalOptions == LayoutAlignment.Center && horizontalOptions == LayoutAlignment.End;
-		static bool IsBottomRight(LayoutAlignment verticalOptions, LayoutAlignment horizontalOptions) => verticalOptions == LayoutAlignment.End && horizontalOptions == LayoutAlignment.End;
-		static bool IsBottom(LayoutAlignment verticalOptions, LayoutAlignment horizontalOptions) => verticalOptions == LayoutAlignment.End && horizontalOptions == LayoutAlignment.Center;
-		static bool IsBottomLeft(LayoutAlignment verticalOptions, LayoutAlignment horizontalOptions) => verticalOptions == LayoutAlignment.End && horizontalOptions == LayoutAlignment.Start;
-		static bool IsLeft(LayoutAlignment verticalOptions, LayoutAlignment horizontalOptions) => verticalOptions == LayoutAlignment.Center && horizontalOptions == LayoutAlignment.Start;
-		static bool IsCenter(LayoutAlignment verticalOptions, LayoutAlignment horizontalOptions) => verticalOptions == LayoutAlignment.Center && horizontalOptions == LayoutAlignment.Center;
-		static bool IsFillLeft(LayoutAlignment verticalOptions, LayoutAlignment horizontalOptions) => verticalOptions == LayoutAlignment.Fill && horizontalOptions == LayoutAlignment.Start;
-		static bool IsFillCenter(LayoutAlignment verticalOptions, LayoutAlignment horizontalOptions) => verticalOptions == LayoutAlignment.Fill && horizontalOptions == LayoutAlignment.Center;
-		static bool IsFillRight(LayoutAlignment verticalOptions, LayoutAlignment horizontalOptions) => verticalOptions == LayoutAlignment.Fill && horizontalOptions == LayoutAlignment.End;
-		static bool IsTopFill(LayoutAlignment verticalOptions, LayoutAlignment horizontalOptions) => verticalOptions == LayoutAlignment.Start && horizontalOptions == LayoutAlignment.Fill;
-		static bool IsCenterFill(LayoutAlignment verticalOptions, LayoutAlignment horizontalOptions) => verticalOptions == LayoutAlignment.Center && horizontalOptions == LayoutAlignment.Fill;
-		static bool IsBottomFill(LayoutAlignment verticalOptions, LayoutAlignment horizontalOptions) => verticalOptions == LayoutAlignment.End && horizontalOptions == LayoutAlignment.Fill;
-		static bool IsFill(LayoutAlignment verticalOptions, LayoutAlignment horizontalOptions) => verticalOptions == LayoutAlignment.Fill && horizontalOptions == LayoutAlignment.Fill;
-	}
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Views/Popup/PopupOverlay.windows.cs b/src/CommunityToolkit.Maui.Core/Views/Popup/PopupOverlay.windows.cs
deleted file mode 100644
index fe89e49614..0000000000
--- a/src/CommunityToolkit.Maui.Core/Views/Popup/PopupOverlay.windows.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-namespace CommunityToolkit.Maui.Core.Views;
-
-/// <summary>
-/// Displays Overlay in the Popup background.
-/// </summary>
-class PopupOverlay : WindowOverlay
-{
-	readonly IWindowOverlayElement popupOverlayElement;
-
-	/// <summary>
-	/// Instantiates a new instance of <see cref="PopupOverlay"/>.
-	/// </summary>
-	/// <param name="window">An instance of <see cref="IWindow"/>.</param>
-	/// <param name="overlayColor">Popup overlay color</param>
-	public PopupOverlay(IWindow window, Color? overlayColor = null) : base(window)
-	{
-		popupOverlayElement = new PopupOverlayElement(this, overlayColor);
-
-		AddWindowElement(popupOverlayElement);
-
-		EnableDrawableTouchHandling = true;
-	}
-
-	class PopupOverlayElement : IWindowOverlayElement
-	{
-		readonly IWindowOverlay overlay;
-		readonly Color overlayColor = Color.FromRgba(255, 255, 255, 153); // 60% Opacity 
-
-		RectF overlayRect = new();
-
-		public PopupOverlayElement(IWindowOverlay overlay, Color? overlayColor = null)
-		{
-			this.overlay = overlay;
-			if (overlayColor is not null)
-			{
-				this.overlayColor = overlayColor;
-			}
-		}
-
-		public bool Contains(Point point)
-		{
-			return overlayRect.Contains(new Point(point.X / overlay.Density, point.Y / overlay.Density));
-		}
-
-		public void Draw(ICanvas canvas, RectF dirtyRect)
-		{
-			overlayRect = dirtyRect;
-			canvas.FillColor = overlayColor;
-			canvas.FillRectangle(dirtyRect.X, dirtyRect.Y, dirtyRect.Width, dirtyRect.Height);
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.UnitTests/BaseHandlerTest.cs b/src/CommunityToolkit.Maui.UnitTests/BaseHandlerTest.cs
index 779fdddfc1..05c3917b4f 100644
--- a/src/CommunityToolkit.Maui.UnitTests/BaseHandlerTest.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/BaseHandlerTest.cs
@@ -1,5 +1,9 @@
 using CommunityToolkit.Maui.Core;
+using CommunityToolkit.Maui.Services;
 using CommunityToolkit.Maui.UnitTests.Mocks;
+using CommunityToolkit.Maui.UnitTests.Services;
+using FluentAssertions;
+using Xunit;
 
 namespace CommunityToolkit.Maui.UnitTests;
 
@@ -13,6 +17,22 @@ protected BaseHandlerTest()
 
 	protected IServiceProvider ServiceProvider { get; }
 
+	protected override async ValueTask DisposeAsyncCore()
+	{
+		await base.DisposeAsyncCore();
+
+		#region Cleanup Popup Tests
+
+		Application.Current.Should().NotBeNull();
+		var navigation = Application.Current.Windows[0].Page?.Navigation ?? throw new InvalidOperationException("Unable to locate Navigation Stack");
+
+		while (navigation.ModalStack.Any())
+		{
+			await navigation.PopModalAsync();
+		}
+		#endregion
+	}
+
 	protected static TElementHandler CreateElementHandler<TElementHandler>(IElement view, bool doesRequireMauiContext = true)
 		where TElementHandler : IElementHandler, new()
 	{
@@ -43,9 +63,11 @@ protected static TViewHandler CreateViewHandler<TViewHandler>(IView view, bool d
 
 	static void InitializeServicesAndSetMockApplication(out IServiceProvider serviceProvider)
 	{
+#pragma warning disable CA1416 // Validate platform compatibility
 		var appBuilder = MauiApp.CreateBuilder()
 			.UseMauiCommunityToolkit()
 			.UseMauiApp<MockApplication>();
+#pragma warning restore CA1416 // Validate platform compatibility
 
 		#region Register Services for CameraTests
 
@@ -58,15 +80,14 @@ static void InitializeServicesAndSetMockApplication(out IServiceProvider service
 		var mockPageViewModel = new MockPageViewModel();
 		var mockPopup = new MockSelfClosingPopup(mockPageViewModel, new());
 
-		PopupService.ClearViewModelToViewMappings();
-		PopupService.AddTransientPopup(mockPopup, mockPageViewModel, appBuilder.Services);
 		var page = new ContentPage();
+		PopupService.AddPopup(mockPopup, mockPageViewModel, appBuilder.Services, ServiceLifetime.Transient);
 		#endregion
 
 		var mauiApp = appBuilder.Build();
 
 		var application = (MockApplication)mauiApp.Services.GetRequiredService<IApplication>();
-		application.AddWindow(new Window() { Page = page });
+		application.AddWindow(new Window { Page = page });
 		serviceProvider = mauiApp.Services;
 
 		IPlatformApplication.Current = application;
@@ -74,7 +95,6 @@ static void InitializeServicesAndSetMockApplication(out IServiceProvider service
 		application.Handler = new ApplicationHandlerStub();
 		application.Handler.SetMauiContext(new HandlersContextStub(serviceProvider));
 
-		CreateElementHandler<MockPopupHandler>(mockPopup);
 		CreateViewHandler<MockPageHandler>(page);
 	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.UnitTests/BaseTest.cs b/src/CommunityToolkit.Maui.UnitTests/BaseTest.cs
index 535918ea92..0ba97d932f 100644
--- a/src/CommunityToolkit.Maui.UnitTests/BaseTest.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/BaseTest.cs
@@ -5,7 +5,7 @@
 namespace CommunityToolkit.Maui.UnitTests;
 
 [Collection("CommunityToolkit.UnitTests")]
-public abstract class BaseTest : IDisposable
+public abstract class BaseTest : IDisposable, IAsyncDisposable
 {
 	readonly CultureInfo defaultCulture, defaultUiCulture;
 	protected readonly MockAppInfo mockAppInfo;
@@ -15,9 +15,15 @@ public abstract class BaseTest : IDisposable
 
 	protected enum TestDuration
 	{
-		Short = 2000,
-		Medium = 5000,
-		Long = 10000
+#if DEBUG
+		Short = 20_000,
+		Medium = 50_000,
+		Long = 100_000
+#else
+		Short = 2_000,
+		Medium = 5_000,
+		Long = 10_000
+#endif
 	}
 
 	protected BaseTest()
@@ -38,12 +44,25 @@ protected BaseTest()
 
 	~BaseTest() => Dispose(false);
 
+	public async ValueTask DisposeAsync()
+	{
+		await DisposeAsyncCore().ConfigureAwait(false);
+
+		Dispose(false);
+		GC.SuppressFinalize(this);
+	}
+
 	public void Dispose()
 	{
 		Dispose(true);
 		GC.SuppressFinalize(this);
 	}
 
+	protected virtual ValueTask DisposeAsyncCore()
+	{
+		return ValueTask.CompletedTask;
+	}
+
 	protected virtual void Dispose(bool isDisposing)
 	{
 		if (isDisposed)
diff --git a/src/CommunityToolkit.Maui.UnitTests/CommunityToolkit.Maui.UnitTests.csproj b/src/CommunityToolkit.Maui.UnitTests/CommunityToolkit.Maui.UnitTests.csproj
index d39187233f..3517824843 100644
--- a/src/CommunityToolkit.Maui.UnitTests/CommunityToolkit.Maui.UnitTests.csproj
+++ b/src/CommunityToolkit.Maui.UnitTests/CommunityToolkit.Maui.UnitTests.csproj
@@ -32,6 +32,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <AssemblyAttribute Include="System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage" />
     <Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
diff --git a/src/CommunityToolkit.Maui.UnitTests/Extensions/PopupExtensionsTests.cs b/src/CommunityToolkit.Maui.UnitTests/Extensions/PopupExtensionsTests.cs
new file mode 100644
index 0000000000..a4f733ad2d
--- /dev/null
+++ b/src/CommunityToolkit.Maui.UnitTests/Extensions/PopupExtensionsTests.cs
@@ -0,0 +1,419 @@
+using CommunityToolkit.Maui.Core;
+using CommunityToolkit.Maui.Extensions;
+using CommunityToolkit.Maui.UnitTests.Mocks;
+using CommunityToolkit.Maui.UnitTests.Services;
+using CommunityToolkit.Maui.Views;
+using Microsoft.Maui.Controls.Shapes;
+using Xunit;
+
+namespace CommunityToolkit.Maui.UnitTests.Extensions;
+
+public class PopupExtensionsTests : BaseHandlerTest
+{
+	readonly INavigation navigation;
+
+	public PopupExtensionsTests()
+	{
+		var page = new MockPage(new MockPageViewModel());
+		Assert.NotNull(Application.Current);
+
+		Application.Current.Windows[0].Page = page;
+		navigation = page.Navigation;
+	}
+
+	[Fact]
+	public void ShowPopupAsync_WithPopupType_ShowsPopup()
+	{
+		// Arrange
+		var selfClosingPopup = ServiceProvider.GetRequiredService<MockSelfClosingPopup>() ?? throw new InvalidOperationException();
+
+		// Act
+		navigation.ShowPopup(selfClosingPopup);
+
+		// Assert
+		Assert.Single(navigation.ModalStack);
+		Assert.IsType<PopupPage>(navigation.ModalStack[0]);
+	}
+	
+	[Fact]
+	public void ShowPopupAsync_WithViewType_ShowsPopup()
+	{
+		// Arrange
+		var view = new Grid();
+
+		// Act
+		navigation.ShowPopup(view);
+
+		// Assert
+		Assert.Single(navigation.ModalStack);
+		Assert.IsType<PopupPage>(navigation.ModalStack[0]);
+	}
+
+	[Fact(Timeout = (int)TestDuration.Short)]
+	public async Task ShowPopupAsync_AwaitingShowPopupAsync_EnsurePreviousPopupClosed()
+	{
+		// Arrange
+		var selfClosingPopup = ServiceProvider.GetRequiredService<MockSelfClosingPopup>() ?? throw new InvalidOperationException();
+
+		// Act
+		await navigation.ShowPopupAsync<object?>(selfClosingPopup, PopupOptions.Empty, CancellationToken.None);
+		await navigation.ShowPopupAsync<object?>(selfClosingPopup, PopupOptions.Empty, CancellationToken.None);
+
+		// Assert
+		Assert.Empty(navigation.ModalStack);
+	}
+	
+	[Fact]
+	public void ShowPopup_NavigationModalStackCountIncreases()
+	{
+		// Arrange
+		var selfClosingPopup = ServiceProvider.GetRequiredService<MockSelfClosingPopup>() ?? throw new InvalidOperationException();
+		Assert.Empty(navigation.ModalStack);
+
+		// Act
+		navigation.ShowPopup(selfClosingPopup, PopupOptions.Empty);
+
+		// Assert
+		Assert.Single(navigation.ModalStack);
+	}
+	
+	[Fact]
+	public void ShowPopupWithView_NavigationModalStackCountIncreases()
+	{
+		// Arrange
+		var view = new Grid();
+		Assert.Empty(navigation.ModalStack);
+
+		// Act
+		navigation.ShowPopup(view, PopupOptions.Empty);
+
+		// Assert
+		Assert.Single(navigation.ModalStack);
+	}
+	
+	[Fact]
+	public void ShowPopup_MultiplePopupsDisplayed()
+	{
+		// Arrange
+		var selfClosingPopup = ServiceProvider.GetRequiredService<MockSelfClosingPopup>() ?? throw new InvalidOperationException();
+
+		// Act
+		navigation.ShowPopup(selfClosingPopup, PopupOptions.Empty);
+		navigation.ShowPopup(selfClosingPopup, PopupOptions.Empty);
+
+		// Assert
+		Assert.Equal(2, navigation.ModalStack.Count);
+	}
+	
+	[Fact]
+	public void ShowPopupView_MultiplePopupsDisplayed()
+	{
+		// Arrange
+		var view = new Grid();
+
+		// Act
+		navigation.ShowPopup(view, PopupOptions.Empty);
+		navigation.ShowPopup(view, PopupOptions.Empty);
+
+		// Assert
+		Assert.Equal(2, navigation.ModalStack.Count);
+	}
+
+	[Fact]
+	public void ShowPopupAsync_WithCustomOptions_AppliesOptions()
+	{
+		// Arrange
+		var onTappingOutsideOfPopup = () => { };
+
+		var selfClosingPopup = ServiceProvider.GetRequiredService<MockSelfClosingPopup>() ?? throw new InvalidOperationException();
+		var options = new PopupOptions
+		{
+			PageOverlayColor = Colors.Red,
+			CanBeDismissedByTappingOutsideOfPopup = false,
+			Shape = new Ellipse(),
+			OnTappingOutsideOfPopup = onTappingOutsideOfPopup
+		};
+
+		// Act
+		navigation.ShowPopup(selfClosingPopup, options);
+
+		var popupPage = (PopupPage)navigation.ModalStack[0];
+		var popupPageContent = popupPage.Content;
+		var border = (Border)popupPageContent.Children[0];
+		var popup = border.Content;
+
+		// Assert
+		Assert.NotNull(popup);
+
+		Assert.Equal(options.PageOverlayColor, popupPage.BackgroundColor);
+		Assert.Equal(popup.HorizontalOptions, border.HorizontalOptions);
+		Assert.Equal(popup.VerticalOptions, border.VerticalOptions);
+		Assert.Equal(options.Shape, border.StrokeShape);
+		Assert.Equal(popup.Margin, border.Margin);
+		Assert.Equal(border.Padding, border.Padding);
+		Assert.Equal(popup.BindingContext, border.BindingContext);
+		Assert.Equal(popupPageContent.BindingContext, border.BindingContext);
+	}
+	
+	[Fact]
+	public void ShowPopupAsyncWithView_WithCustomOptions_AppliesOptions()
+	{
+		// Arrange
+		var onTappingOutsideOfPopup = () => { };
+
+		var view = new Grid
+		{
+			HorizontalOptions = LayoutOptions.End,
+			VerticalOptions = LayoutOptions.Start,
+		};
+		var options = new PopupOptions
+		{
+			PageOverlayColor = Colors.Red,
+			CanBeDismissedByTappingOutsideOfPopup = false,
+			Shape = new Ellipse(),
+			OnTappingOutsideOfPopup = onTappingOutsideOfPopup
+		};
+
+		// Act
+		navigation.ShowPopup(view, options);
+
+		var popupPage = (PopupPage)navigation.ModalStack[0];
+		var popupPageContent = popupPage.Content;
+		var border = (Border)popupPageContent.Children[0];
+		var popup = (Popup)(border.Content ?? throw new InvalidCastException());
+
+		// Assert
+		Assert.NotNull(popup);
+
+		Assert.Equal(view.HorizontalOptions, border.HorizontalOptions);
+		Assert.Equal(view.VerticalOptions, border.VerticalOptions);
+		Assert.Equal(view.Margin, border.Margin);
+		Assert.Equal(view.Padding, border.Padding);
+		Assert.Equal(popup.HorizontalOptions, border.HorizontalOptions);
+		Assert.Equal(popup.VerticalOptions, border.VerticalOptions);
+		Assert.Equal(popup.Margin, border.Margin);
+		Assert.Equal(popup.Padding, border.Padding);
+		Assert.Equal(popup.BindingContext, border.BindingContext);
+		Assert.Equal(options.Shape, border.StrokeShape);
+		Assert.Equal(options.PageOverlayColor, popupPage.BackgroundColor);
+		Assert.Equal(popupPageContent.BindingContext, border.BindingContext);
+	}
+
+	[Fact(Timeout = (int)TestDuration.Short)]
+	public async Task ShowPopupAsync_CancellationTokenExpired()
+	{
+		var selfClosingPopup = ServiceProvider.GetRequiredService<MockSelfClosingPopup>() ?? throw new InvalidOperationException();
+
+		var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(1));
+
+		// Ensure CancellationToken has expired
+		await Task.Delay(100, CancellationToken.None);
+
+		await Assert.ThrowsAsync<OperationCanceledException>(() => navigation.ShowPopupAsync(selfClosingPopup, PopupOptions.Empty, cts.Token));
+	}
+	
+	[Fact(Timeout = (int)TestDuration.Short)]
+	public async Task ShowPopupAsyncWithView_CancellationTokenExpired()
+	{
+		var view = new Grid();
+
+		var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(1));
+
+		// Ensure CancellationToken has expired
+		await Task.Delay(100, CancellationToken.None);
+
+		await Assert.ThrowsAsync<OperationCanceledException>(() => navigation.ShowPopupAsync(view, PopupOptions.Empty, cts.Token));
+	}
+
+	[Fact(Timeout = (int)TestDuration.Short)]
+	public async Task ShowPopupAsync_CancellationTokenCanceled()
+	{
+		var selfClosingPopup = ServiceProvider.GetRequiredService<MockSelfClosingPopup>() ?? throw new InvalidOperationException();
+
+		var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(1));
+
+		// Ensure CancellationToken has expired
+		await cts.CancelAsync();
+
+		await Assert.ThrowsAsync<OperationCanceledException>(() => navigation.ShowPopupAsync(selfClosingPopup, PopupOptions.Empty, cts.Token));
+	}
+	
+	[Fact(Timeout = (int)TestDuration.Short)]
+	public async Task ShowPopupAsyncWithView_CancellationTokenCanceled()
+	{
+		var view = new Grid();
+
+		var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(1));
+
+		// Ensure CancellationToken has expired
+		await cts.CancelAsync();
+
+		await Assert.ThrowsAsync<OperationCanceledException>(() => navigation.ShowPopupAsync(view, PopupOptions.Empty, cts.Token));
+	}
+
+	[Fact(Timeout = (int)TestDuration.Medium)]
+	public async Task ShowPopupAsync_ShouldValidateProperBindingContext()
+	{
+		var selfClosingPopup = ServiceProvider.GetRequiredService<MockSelfClosingPopup>() ?? throw new InvalidOperationException();
+		var popupInstance = ServiceProvider.GetRequiredService<MockSelfClosingPopup>();
+		var popupViewModel = ServiceProvider.GetRequiredService<MockPageViewModel>();
+
+		await navigation.ShowPopupAsync<object?>(selfClosingPopup, PopupOptions.Empty, TestContext.Current.CancellationToken);
+
+		Assert.Same(popupInstance.BindingContext, popupViewModel);
+	}
+	
+	[Fact(Timeout = (int)TestDuration.Medium)]
+	public async Task ShowPopupAsyncWithView_ShouldValidateProperBindingContext()
+	{
+		var view = new Grid();
+		var popupInstance = ServiceProvider.GetRequiredService<MockSelfClosingPopup>();
+		var popupViewModel = ServiceProvider.GetRequiredService<MockPageViewModel>();
+
+		var showPopupTask = navigation.ShowPopupAsync<object?>(view, PopupOptions.Empty, TestContext.Current.CancellationToken);
+		
+		var popupPage = (PopupPage)navigation.ModalStack[0];
+		await popupPage.Close(new PopupResult<object?>(null, false), TestContext.Current.CancellationToken);
+		
+		await showPopupTask;
+
+		Assert.Same(popupInstance.BindingContext, popupViewModel);
+	}
+
+	[Fact(Timeout = (int)TestDuration.Medium)]
+	public async Task ShowPopupAsync_ShouldReturnResultOnceClosed()
+	{
+		var mockPopup = ServiceProvider.GetRequiredService<MockSelfClosingPopup>();
+		var selfClosingPopup = ServiceProvider.GetRequiredService<MockSelfClosingPopup>() ?? throw new InvalidOperationException();
+
+		var result = await navigation.ShowPopupAsync<object?>(selfClosingPopup, PopupOptions.Empty, CancellationToken.None);
+
+		Assert.Same(mockPopup.Result, result.Result);
+		Assert.False(result.WasDismissedByTappingOutsideOfPopup);
+	}
+	
+	[Fact(Timeout = (int)TestDuration.Medium)]
+	public async Task ShowPopupAsyncWithView_ShouldReturnResultOnceClosed()
+	{
+		const int popupResultValue = 2;
+		
+		var view = new Grid();
+		var expectedPopupResult = new PopupResult<int>(popupResultValue, false);
+
+		var showPopupTask = navigation.ShowPopupAsync<int>(view, PopupOptions.Empty, CancellationToken.None);
+
+		var popupPage = (PopupPage)navigation.ModalStack[0];
+		await popupPage.Close(expectedPopupResult, TestContext.Current.CancellationToken);
+		
+		var actualPopupResult = await showPopupTask;
+
+		Assert.Same(expectedPopupResult, actualPopupResult);
+		Assert.False(expectedPopupResult.WasDismissedByTappingOutsideOfPopup);
+		Assert.Equal(popupResultValue, expectedPopupResult.Result);
+	}
+
+	[Fact(Timeout = (int)TestDuration.Short)]
+	public async Task ShowPopupAsync_ShouldThrowArgumentNullException_WhenViewIsNull()
+	{
+#pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
+		await Assert.ThrowsAsync<ArgumentNullException>(() => navigation.ShowPopupAsync(null, PopupOptions.Empty, CancellationToken.None));
+#pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
+	}
+	
+	[Fact(Timeout = (int)TestDuration.Short)]
+	public async Task ShowPopupAsync_ShouldThrowArgumentNullException_WhenNavigationIsNull()
+	{
+		var selfClosingPopup = ServiceProvider.GetRequiredService<MockSelfClosingPopup>() ?? throw new InvalidOperationException();
+		
+#pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
+		await Assert.ThrowsAsync<ArgumentNullException>(() => PopupExtensions.ShowPopupAsync((INavigation?)null, selfClosingPopup, PopupOptions.Empty, CancellationToken.None));
+#pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
+	}
+
+	[Fact(Timeout = (int)TestDuration.Short)]
+	public async Task ShowPopupAsync_ShouldReturnDefaultResult_WhenPopupIsClosedWithoutResult()
+	{
+		var selfClosingPopup = ServiceProvider.GetRequiredService<MockSelfClosingPopup>();
+
+		var result = await navigation.ShowPopupAsync<object?>(selfClosingPopup, PopupOptions.Empty, CancellationToken.None);
+
+		Assert.Equal(selfClosingPopup.Result, result.Result);
+		Assert.False(result.WasDismissedByTappingOutsideOfPopup);
+	}
+	
+	[Fact(Timeout = (int)TestDuration.Short)]
+	public async Task ShowPopupAsync_ReferenceTypeShouldReturnResult_WhenPopupIsClosedByTappingOutsidePopup()
+	{
+		var popupClosedTCS = new TaskCompletionSource<IPopupResult>();
+
+		var showPopupTask = navigation.ShowPopupAsync<bool?>(new Popup<bool>(), token: CancellationToken.None);
+		var popupPage = (PopupPage)navigation.ModalStack[0];
+		popupPage.PopupClosed += HandlePopupClosed;
+		
+		var tapGestureRecognizer = (TapGestureRecognizer)popupPage.Content.GestureRecognizers[0];
+		tapGestureRecognizer.Command?.Execute(null);
+		
+		var popupClosedResult = await popupClosedTCS.Task;
+		var showPopupResult = await showPopupTask;
+		
+		Assert.True(popupClosedResult.WasDismissedByTappingOutsideOfPopup);
+		Assert.Null(showPopupResult.Result);
+		Assert.True(showPopupResult.WasDismissedByTappingOutsideOfPopup);
+
+		void HandlePopupClosed(object? sender, IPopupResult e)
+		{
+			popupClosedTCS.SetResult(e);
+		}
+	}
+	
+	[Fact(Timeout = (int)TestDuration.Short)]
+	public async Task ShowPopupAsync_NullableValueTypeShouldReturnResult_WhenPopupIsClosedByTappingOutsidePopup()
+	{
+		var popupClosedTCS = new TaskCompletionSource<IPopupResult>();
+
+		var showPopupTask = navigation.ShowPopupAsync<bool?>(new Popup<bool>(), token: CancellationToken.None);
+		var popupPage = (PopupPage)navigation.ModalStack[0];
+		popupPage.PopupClosed += HandlePopupClosed;
+		
+		var tapGestureRecognizer = (TapGestureRecognizer)popupPage.Content.GestureRecognizers[0];
+		tapGestureRecognizer.Command?.Execute(null);
+		
+		var popupClosedResult = await popupClosedTCS.Task;
+		var showPopupResult = await showPopupTask;
+		
+		Assert.True(popupClosedResult.WasDismissedByTappingOutsideOfPopup);
+		Assert.Null(showPopupResult.Result);
+		Assert.True(showPopupResult.WasDismissedByTappingOutsideOfPopup);
+
+		void HandlePopupClosed(object? sender, IPopupResult e)
+		{
+			popupClosedTCS.SetResult(e);
+		}
+	}
+
+	[Fact(Timeout = (int)TestDuration.Short)]
+	public async Task ShowPopupAsync_ValueTypeShouldReturnResult_WhenPopupIsClosedByTappingOutsidePopup()
+	{
+		var popupClosedTCS = new TaskCompletionSource<IPopupResult>();
+
+		var showPopupTask = navigation.ShowPopupAsync<bool>(new Popup<bool>(), token: CancellationToken.None);
+		var popupPage = (PopupPage)navigation.ModalStack[0];
+		popupPage.PopupClosed += HandlePopupClosed;
+		
+		var tapGestureRecognizer = (TapGestureRecognizer)popupPage.Content.GestureRecognizers[0];
+		tapGestureRecognizer.Command?.Execute(null);
+		
+		var popupClosedResult = await popupClosedTCS.Task;
+		var showPopupResult = await showPopupTask;
+		
+		Assert.True(popupClosedResult.WasDismissedByTappingOutsideOfPopup);
+		Assert.True(showPopupResult.WasDismissedByTappingOutsideOfPopup);
+		Assert.ThrowsAny<PopupResultException>(() => (bool?)showPopupResult.Result);
+		Assert.ThrowsAny<InvalidCastException>(() => (bool?)showPopupResult.Result);
+
+		void HandlePopupClosed(object? sender, IPopupResult e)
+		{
+			popupClosedTCS.SetResult(e);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.UnitTests/Extensions/ServiceCollectionExtensionsTests.cs b/src/CommunityToolkit.Maui.UnitTests/Extensions/ServiceCollectionExtensionsTests.cs
index f536d0022c..ba62812ffb 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Extensions/ServiceCollectionExtensionsTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Extensions/ServiceCollectionExtensionsTests.cs
@@ -1,4 +1,5 @@
 using CommunityToolkit.Maui.UnitTests.Mocks;
+using CommunityToolkit.Maui.UnitTests.Services;
 using Xunit;
 
 namespace CommunityToolkit.Maui.UnitTests.Extensions;
@@ -7,7 +8,61 @@ public class ServiceCollectionExtensionsTests : BaseTest
 {
 	const string customRoute = "//MockCustomRoute";
 	readonly Type mockPageType = typeof(MockPage);
-	readonly Type mockPageViewModelType = typeof(MockPageViewModel);
+	readonly Type mockPopupType = typeof(MockSelfClosingPopup);
+	readonly Type mockViewModelType = typeof(MockPageViewModel);
+	
+	[Fact]
+	public void IServiceCollection_VerifyTransientPopup()
+	{
+		// Arrange
+		var services = MauiApp.CreateBuilder().Services;
+		const ServiceLifetime expectedServiceLifetime = ServiceLifetime.Transient;
+
+		// Act
+		services.AddTransientPopup<MockPopup>();
+		var serviceProvider = services.BuildServiceProvider();
+
+		// Assert
+		var mockPopupServiceDescriptor = services.Single(s => s.ServiceType == typeof(MockPopup) && s.Lifetime.Equals(expectedServiceLifetime));
+
+		Assert.NotNull(mockPopupServiceDescriptor);
+		Assert.Equal(expectedServiceLifetime, mockPopupServiceDescriptor.Lifetime);
+		Assert.Equal(typeof(MockPopup), mockPopupServiceDescriptor.ServiceType);
+		Assert.Equal(typeof(MockPopup), mockPopupServiceDescriptor.ImplementationType);
+
+		Assert.IsType<MockPopup>(serviceProvider.GetRequiredService<MockPopup>());
+	}
+	
+	[Fact]
+	public void IServiceCollection_VerifyTransientPopupWithViewModel()
+	{
+		// Arrange
+		var services = MauiApp.CreateBuilder().Services;
+		const ServiceLifetime expectedServiceLifetime = ServiceLifetime.Transient;
+
+		// Act
+		services.AddTransientPopup<MockSelfClosingPopup, MockPageViewModel>();
+		var serviceProvider = services.BuildServiceProvider();
+
+		// Assert
+		var mockPopupServiceDescriptor = services.Single(s => s.ServiceType == mockPopupType && s.Lifetime.Equals(expectedServiceLifetime));
+		var mockViewModelServiceDescriptor = services.Single(s => s.ServiceType == mockViewModelType && s.Lifetime.Equals(expectedServiceLifetime));
+
+		Assert.NotNull(mockPopupServiceDescriptor);
+		Assert.NotNull(mockViewModelServiceDescriptor);
+
+		Assert.Equal(expectedServiceLifetime, mockPopupServiceDescriptor.Lifetime);
+		Assert.Equal(expectedServiceLifetime, mockViewModelServiceDescriptor.Lifetime);
+
+		Assert.Equal(mockPopupType, mockPopupServiceDescriptor.ServiceType);
+		Assert.Equal(mockViewModelType, mockViewModelServiceDescriptor.ServiceType);
+
+		Assert.Equal(mockPopupType, mockPopupServiceDescriptor.ImplementationType);
+		Assert.Equal(mockViewModelType, mockViewModelServiceDescriptor.ImplementationType);
+
+		Assert.IsType<MockSelfClosingPopup>(serviceProvider.GetRequiredService<MockSelfClosingPopup>());
+		Assert.IsType<MockPageViewModel>(serviceProvider.GetRequiredService<MockPageViewModel>());
+	}
 
 	[Fact]
 	public void IServiceCollection_VerifyTransient()
@@ -21,8 +76,8 @@ public void IServiceCollection_VerifyTransient()
 		var serviceProvider = services.BuildServiceProvider();
 
 		// Assert
-		var mockPageServiceDescriptor = services.Single(s => s.ServiceType.Equals(mockPageType) && s.Lifetime.Equals(expectedServiceLifetime));
-		var mockViewModelServiceDescriptor = services.Single(s => s.ServiceType.Equals(mockPageViewModelType) && s.Lifetime.Equals(expectedServiceLifetime));
+		var mockPageServiceDescriptor = services.Single(s => s.ServiceType == mockPageType && s.Lifetime.Equals(expectedServiceLifetime));
+		var mockViewModelServiceDescriptor = services.Single(s => s.ServiceType == mockViewModelType && s.Lifetime.Equals(expectedServiceLifetime));
 
 		Assert.NotNull(mockPageServiceDescriptor);
 		Assert.NotNull(mockViewModelServiceDescriptor);
@@ -31,10 +86,10 @@ public void IServiceCollection_VerifyTransient()
 		Assert.Equal(expectedServiceLifetime, mockViewModelServiceDescriptor.Lifetime);
 
 		Assert.Equal(mockPageType, mockPageServiceDescriptor.ServiceType);
-		Assert.Equal(mockPageViewModelType, mockViewModelServiceDescriptor.ServiceType);
+		Assert.Equal(mockViewModelType, mockViewModelServiceDescriptor.ServiceType);
 
 		Assert.Equal(mockPageType, mockPageServiceDescriptor.ImplementationType);
-		Assert.Equal(mockPageViewModelType, mockViewModelServiceDescriptor.ImplementationType);
+		Assert.Equal(mockViewModelType, mockViewModelServiceDescriptor.ImplementationType);
 
 		Assert.IsType<MockPage>(serviceProvider.GetRequiredService<MockPage>());
 		Assert.IsType<MockPageViewModel>(serviceProvider.GetRequiredService<MockPageViewModel>());
@@ -53,8 +108,8 @@ public void IServiceCollection_VerifyTransientShellRouteWithRouteParam()
 		var serviceProvider = services.BuildServiceProvider();
 
 		// Assert
-		var mockPageServiceDescriptor = services.Single(s => s.ServiceType.Equals(mockPageType) && s.Lifetime.Equals(expectedServiceLifetime));
-		var mockViewModelServiceDescriptor = services.Single(s => s.ServiceType.Equals(mockPageViewModelType) && s.Lifetime.Equals(expectedServiceLifetime));
+		var mockPageServiceDescriptor = services.Single(s => s.ServiceType == mockPageType && s.Lifetime.Equals(expectedServiceLifetime));
+		var mockViewModelServiceDescriptor = services.Single(s => s.ServiceType == mockViewModelType && s.Lifetime.Equals(expectedServiceLifetime));
 
 		Assert.NotNull(mockPageServiceDescriptor);
 		Assert.NotNull(mockViewModelServiceDescriptor);
@@ -65,10 +120,10 @@ public void IServiceCollection_VerifyTransientShellRouteWithRouteParam()
 		Assert.Equal(expectedServiceLifetime, mockViewModelServiceDescriptor.Lifetime);
 
 		Assert.Equal(mockPageType, mockPageServiceDescriptor.ServiceType);
-		Assert.Equal(mockPageViewModelType, mockViewModelServiceDescriptor.ServiceType);
+		Assert.Equal(mockViewModelType, mockViewModelServiceDescriptor.ServiceType);
 
 		Assert.Equal(mockPageType, mockPageServiceDescriptor.ImplementationType);
-		Assert.Equal(mockPageViewModelType, mockViewModelServiceDescriptor.ImplementationType);
+		Assert.Equal(mockViewModelType, mockViewModelServiceDescriptor.ImplementationType);
 
 		Assert.IsType<MockPage>(serviceProvider.GetRequiredService<MockPage>());
 		Assert.IsType<MockPageViewModel>(serviceProvider.GetRequiredService<MockPageViewModel>());
@@ -88,8 +143,8 @@ public void IServiceCollection_VerifyTransientShellRouteWithRouteAndRouteFactory
 		var serviceProvider = services.BuildServiceProvider();
 
 		// Assert
-		var mockPageServiceDescriptor = services.Single(s => s.ServiceType.Equals(mockPageType) && s.Lifetime.Equals(expectedServiceLifetime));
-		var mockViewModelServiceDescriptor = services.Single(s => s.ServiceType.Equals(mockPageViewModelType) && s.Lifetime.Equals(expectedServiceLifetime));
+		var mockPageServiceDescriptor = services.Single(s => s.ServiceType == mockPageType && s.Lifetime.Equals(expectedServiceLifetime));
+		var mockViewModelServiceDescriptor = services.Single(s => s.ServiceType == mockViewModelType && s.Lifetime.Equals(expectedServiceLifetime));
 
 		Assert.NotNull(mockPageServiceDescriptor);
 		Assert.NotNull(mockViewModelServiceDescriptor);
@@ -100,15 +155,68 @@ public void IServiceCollection_VerifyTransientShellRouteWithRouteAndRouteFactory
 		Assert.Equal(expectedServiceLifetime, mockViewModelServiceDescriptor.Lifetime);
 
 		Assert.Equal(mockPageType, mockPageServiceDescriptor.ServiceType);
-		Assert.Equal(mockPageViewModelType, mockViewModelServiceDescriptor.ServiceType);
+		Assert.Equal(mockViewModelType, mockViewModelServiceDescriptor.ServiceType);
 
 		Assert.Equal(mockPageType, mockPageServiceDescriptor.ImplementationType);
-		Assert.Equal(mockPageViewModelType, mockViewModelServiceDescriptor.ImplementationType);
+		Assert.Equal(mockViewModelType, mockViewModelServiceDescriptor.ImplementationType);
 
 		Assert.IsType<MockPage>(serviceProvider.GetRequiredService<MockPage>());
 		Assert.IsType<MockPageViewModel>(serviceProvider.GetRequiredService<MockPageViewModel>());
 		Assert.True(factory.WasInvoked);
 	}
+	
+	[Fact]
+	public void IServiceCollection_VerifySingletonPopup()
+	{
+		// Arrange
+		const ServiceLifetime expectedServiceLifetime = ServiceLifetime.Singleton;
+		var services = MauiApp.CreateBuilder().Services;
+
+		// Act
+		services.AddSingletonPopup<MockPopup>();
+		var serviceProvider = services.BuildServiceProvider();
+
+		// Assert
+		var mockPopupServiceDescriptor = services.Single(s => s.ServiceType == typeof(MockPopup) && s.Lifetime.Equals(expectedServiceLifetime));
+
+		Assert.NotNull(mockPopupServiceDescriptor);
+		Assert.Equal(expectedServiceLifetime, mockPopupServiceDescriptor.Lifetime);
+		Assert.Equal(typeof(MockPopup), mockPopupServiceDescriptor.ServiceType);
+		Assert.Equal(typeof(MockPopup), mockPopupServiceDescriptor.ImplementationType);
+		
+		Assert.IsType<MockPopup>(serviceProvider.GetRequiredService<MockPopup>());
+	}
+	
+	[Fact]
+	public void IServiceCollection_VerifySingletonPopupWithViewModel()
+	{
+		// Arrange
+		const ServiceLifetime expectedServiceLifetime = ServiceLifetime.Singleton;
+		var services = MauiApp.CreateBuilder().Services;
+
+		// Act
+		services.AddSingletonPopup<MockSelfClosingPopup, MockPageViewModel>();
+		var serviceProvider = services.BuildServiceProvider();
+
+		// Assert
+		var mockPopupServiceDescriptor = services.Single(s => s.ServiceType == mockPopupType && s.Lifetime.Equals(expectedServiceLifetime));
+		var mockViewModelServiceDescriptor = services.Single(s => s.ServiceType == mockViewModelType && s.Lifetime.Equals(expectedServiceLifetime));
+
+		Assert.NotNull(mockPopupServiceDescriptor);
+		Assert.NotNull(mockViewModelServiceDescriptor);
+
+		Assert.Equal(expectedServiceLifetime, mockPopupServiceDescriptor.Lifetime);
+		Assert.Equal(expectedServiceLifetime, mockViewModelServiceDescriptor.Lifetime);
+
+		Assert.Equal(mockPopupType, mockPopupServiceDescriptor.ServiceType);
+		Assert.Equal(mockViewModelType, mockViewModelServiceDescriptor.ServiceType);
+
+		Assert.Equal(mockPopupType, mockPopupServiceDescriptor.ImplementationType);
+		Assert.Equal(mockViewModelType, mockViewModelServiceDescriptor.ImplementationType);
+
+		Assert.IsType<MockSelfClosingPopup>(serviceProvider.GetRequiredService<MockSelfClosingPopup>());
+		Assert.IsType<MockPageViewModel>(serviceProvider.GetRequiredService<MockPageViewModel>());
+	}
 
 	[Fact]
 	public void IServiceCollection_VerifySingleton()
@@ -122,8 +230,8 @@ public void IServiceCollection_VerifySingleton()
 		var serviceProvider = services.BuildServiceProvider();
 
 		// Assert
-		var mockPageServiceDescriptor = services.Single(s => s.ServiceType.Equals(mockPageType) && s.Lifetime.Equals(expectedServiceLifetime));
-		var mockViewModelServiceDescriptor = services.Single(s => s.ServiceType.Equals(mockPageViewModelType) && s.Lifetime.Equals(expectedServiceLifetime));
+		var mockPageServiceDescriptor = services.Single(s => s.ServiceType == mockPageType && s.Lifetime.Equals(expectedServiceLifetime));
+		var mockViewModelServiceDescriptor = services.Single(s => s.ServiceType == mockViewModelType && s.Lifetime.Equals(expectedServiceLifetime));
 
 		Assert.NotNull(mockPageServiceDescriptor);
 		Assert.NotNull(mockViewModelServiceDescriptor);
@@ -132,10 +240,10 @@ public void IServiceCollection_VerifySingleton()
 		Assert.Equal(expectedServiceLifetime, mockViewModelServiceDescriptor.Lifetime);
 
 		Assert.Equal(mockPageType, mockPageServiceDescriptor.ServiceType);
-		Assert.Equal(mockPageViewModelType, mockViewModelServiceDescriptor.ServiceType);
+		Assert.Equal(mockViewModelType, mockViewModelServiceDescriptor.ServiceType);
 
 		Assert.Equal(mockPageType, mockPageServiceDescriptor.ImplementationType);
-		Assert.Equal(mockPageViewModelType, mockViewModelServiceDescriptor.ImplementationType);
+		Assert.Equal(mockViewModelType, mockViewModelServiceDescriptor.ImplementationType);
 
 		Assert.IsType<MockPage>(serviceProvider.GetRequiredService<MockPage>());
 		Assert.IsType<MockPageViewModel>(serviceProvider.GetRequiredService<MockPageViewModel>());
@@ -154,8 +262,8 @@ public void IServiceCollection_VerifySingletonShellRouteWithRouteParam()
 		var serviceProvider = services.BuildServiceProvider();
 
 		// Assert
-		var mockPageServiceDescriptor = services.Single(s => s.ServiceType.Equals(mockPageType) && s.Lifetime.Equals(expectedServiceLifetime));
-		var mockViewModelServiceDescriptor = services.Single(s => s.ServiceType.Equals(mockPageViewModelType) && s.Lifetime.Equals(expectedServiceLifetime));
+		var mockPageServiceDescriptor = services.Single(s => s.ServiceType == mockPageType && s.Lifetime.Equals(expectedServiceLifetime));
+		var mockViewModelServiceDescriptor = services.Single(s => s.ServiceType == mockViewModelType && s.Lifetime.Equals(expectedServiceLifetime));
 
 		Assert.NotNull(mockPageServiceDescriptor);
 		Assert.NotNull(mockViewModelServiceDescriptor);
@@ -166,10 +274,10 @@ public void IServiceCollection_VerifySingletonShellRouteWithRouteParam()
 		Assert.Equal(expectedServiceLifetime, mockViewModelServiceDescriptor.Lifetime);
 
 		Assert.Equal(mockPageType, mockPageServiceDescriptor.ServiceType);
-		Assert.Equal(mockPageViewModelType, mockViewModelServiceDescriptor.ServiceType);
+		Assert.Equal(mockViewModelType, mockViewModelServiceDescriptor.ServiceType);
 
 		Assert.Equal(mockPageType, mockPageServiceDescriptor.ImplementationType);
-		Assert.Equal(mockPageViewModelType, mockViewModelServiceDescriptor.ImplementationType);
+		Assert.Equal(mockViewModelType, mockViewModelServiceDescriptor.ImplementationType);
 
 		Assert.IsType<MockPage>(serviceProvider.GetRequiredService<MockPage>());
 		Assert.IsType<MockPageViewModel>(serviceProvider.GetRequiredService<MockPageViewModel>());
@@ -189,8 +297,8 @@ public void IServiceCollection_VerifySingletonShellRouteWithRouteAndRouteFactory
 		var serviceProvider = services.BuildServiceProvider();
 
 		// Assert
-		var mockPageServiceDescriptor = services.Single(s => s.ServiceType.Equals(mockPageType) && s.Lifetime.Equals(expectedServiceLifetime));
-		var mockViewModelServiceDescriptor = services.Single(s => s.ServiceType.Equals(mockPageViewModelType) && s.Lifetime.Equals(expectedServiceLifetime));
+		var mockPageServiceDescriptor = services.Single(s => s.ServiceType == mockPageType && s.Lifetime.Equals(expectedServiceLifetime));
+		var mockViewModelServiceDescriptor = services.Single(s => s.ServiceType == mockViewModelType && s.Lifetime.Equals(expectedServiceLifetime));
 
 		Assert.NotNull(mockPageServiceDescriptor);
 		Assert.NotNull(mockViewModelServiceDescriptor);
@@ -201,16 +309,69 @@ public void IServiceCollection_VerifySingletonShellRouteWithRouteAndRouteFactory
 		Assert.Equal(expectedServiceLifetime, mockViewModelServiceDescriptor.Lifetime);
 
 		Assert.Equal(mockPageType, mockPageServiceDescriptor.ServiceType);
-		Assert.Equal(mockPageViewModelType, mockViewModelServiceDescriptor.ServiceType);
+		Assert.Equal(mockViewModelType, mockViewModelServiceDescriptor.ServiceType);
 
 		Assert.Equal(mockPageType, mockPageServiceDescriptor.ImplementationType);
-		Assert.Equal(mockPageViewModelType, mockViewModelServiceDescriptor.ImplementationType);
+		Assert.Equal(mockViewModelType, mockViewModelServiceDescriptor.ImplementationType);
 
 		Assert.IsType<MockPage>(serviceProvider.GetRequiredService<MockPage>());
 		Assert.IsType<MockPageViewModel>(serviceProvider.GetRequiredService<MockPageViewModel>());
 
 		Assert.True(factory.WasInvoked);
 	}
+	
+	[Fact]
+	public void IServiceCollection_VerifyScopedPopup()
+	{
+		// Arrange
+		const ServiceLifetime expectedServiceLifetime = ServiceLifetime.Scoped;
+		var services = MauiApp.CreateBuilder().Services;
+
+		// Act
+		services.AddScopedPopup<MockPopup>();
+		var serviceProvider = services.BuildServiceProvider();
+
+		// Assert
+		var mockPopupServiceDescriptor = services.Single(s => s.ServiceType == typeof(MockPopup) && s.Lifetime.Equals(expectedServiceLifetime));
+
+		Assert.NotNull(mockPopupServiceDescriptor);
+		Assert.Equal(expectedServiceLifetime, mockPopupServiceDescriptor.Lifetime);
+		Assert.Equal(typeof(MockPopup), mockPopupServiceDescriptor.ServiceType);
+		Assert.Equal(typeof(MockPopup), mockPopupServiceDescriptor.ImplementationType);
+		
+		Assert.IsType<MockPopup>(serviceProvider.GetRequiredService<MockPopup>());
+	}
+	
+	[Fact]
+	public void IServiceCollection_VerifyScopedPopupWithViewModel()
+	{
+		// Arrange
+		const ServiceLifetime expectedServiceLifetime = ServiceLifetime.Scoped;
+		var services = MauiApp.CreateBuilder().Services;
+
+		// Act
+		services.AddScopedPopup<MockSelfClosingPopup, MockPageViewModel>();
+		var serviceProvider = services.BuildServiceProvider();
+
+		// Assert
+		var mockPopupServiceDescriptor = services.Single(s => s.ServiceType == mockPopupType && s.Lifetime.Equals(expectedServiceLifetime));
+		var mockViewModelServiceDescriptor = services.Single(s => s.ServiceType == mockViewModelType && s.Lifetime.Equals(expectedServiceLifetime));
+
+		Assert.NotNull(mockPopupServiceDescriptor);
+		Assert.NotNull(mockViewModelServiceDescriptor);
+
+		Assert.Equal(expectedServiceLifetime, mockPopupServiceDescriptor.Lifetime);
+		Assert.Equal(expectedServiceLifetime, mockViewModelServiceDescriptor.Lifetime);
+
+		Assert.Equal(mockPopupType, mockPopupServiceDescriptor.ServiceType);
+		Assert.Equal(mockViewModelType, mockViewModelServiceDescriptor.ServiceType);
+
+		Assert.Equal(mockPopupType, mockPopupServiceDescriptor.ImplementationType);
+		Assert.Equal(mockViewModelType, mockViewModelServiceDescriptor.ImplementationType);
+
+		Assert.IsType<MockSelfClosingPopup>(serviceProvider.GetRequiredService<MockSelfClosingPopup>());
+		Assert.IsType<MockPageViewModel>(serviceProvider.GetRequiredService<MockPageViewModel>());
+	}
 
 	[Fact]
 	public void IServiceCollection_VerifyScoped()
@@ -224,8 +385,8 @@ public void IServiceCollection_VerifyScoped()
 		var serviceProvider = services.BuildServiceProvider();
 
 		// Assert
-		var mockPageServiceDescriptor = services.Single(s => s.ServiceType.Equals(mockPageType) && s.Lifetime.Equals(expectedServiceLifetime));
-		var mockViewModelServiceDescriptor = services.Single(s => s.ServiceType.Equals(mockPageViewModelType) && s.Lifetime.Equals(expectedServiceLifetime));
+		var mockPageServiceDescriptor = services.Single(s => s.ServiceType == mockPageType && s.Lifetime.Equals(expectedServiceLifetime));
+		var mockViewModelServiceDescriptor = services.Single(s => s.ServiceType == mockViewModelType && s.Lifetime.Equals(expectedServiceLifetime));
 
 		Assert.NotNull(mockPageServiceDescriptor);
 		Assert.NotNull(mockViewModelServiceDescriptor);
@@ -234,10 +395,10 @@ public void IServiceCollection_VerifyScoped()
 		Assert.Equal(expectedServiceLifetime, mockViewModelServiceDescriptor.Lifetime);
 
 		Assert.Equal(mockPageType, mockPageServiceDescriptor.ServiceType);
-		Assert.Equal(mockPageViewModelType, mockViewModelServiceDescriptor.ServiceType);
+		Assert.Equal(mockViewModelType, mockViewModelServiceDescriptor.ServiceType);
 
 		Assert.Equal(mockPageType, mockPageServiceDescriptor.ImplementationType);
-		Assert.Equal(mockPageViewModelType, mockViewModelServiceDescriptor.ImplementationType);
+		Assert.Equal(mockViewModelType, mockViewModelServiceDescriptor.ImplementationType);
 
 		Assert.IsType<MockPage>(serviceProvider.GetRequiredService<MockPage>());
 		Assert.IsType<MockPageViewModel>(serviceProvider.GetRequiredService<MockPageViewModel>());
@@ -256,8 +417,8 @@ public void IServiceCollection_VerifyScopedShellRouteWithRouteParam()
 		var serviceProvider = services.BuildServiceProvider();
 
 		// Assert
-		var mockPageServiceDescriptor = services.Single(s => s.ServiceType.Equals(mockPageType) && s.Lifetime.Equals(expectedServiceLifetime));
-		var mockViewModelServiceDescriptor = services.Single(s => s.ServiceType.Equals(mockPageViewModelType) && s.Lifetime.Equals(expectedServiceLifetime));
+		var mockPageServiceDescriptor = services.Single(s => s.ServiceType == mockPageType && s.Lifetime.Equals(expectedServiceLifetime));
+		var mockViewModelServiceDescriptor = services.Single(s => s.ServiceType == mockViewModelType && s.Lifetime.Equals(expectedServiceLifetime));
 
 		Assert.NotNull(mockPageServiceDescriptor);
 		Assert.NotNull(mockViewModelServiceDescriptor);
@@ -268,10 +429,10 @@ public void IServiceCollection_VerifyScopedShellRouteWithRouteParam()
 		Assert.Equal(expectedServiceLifetime, mockViewModelServiceDescriptor.Lifetime);
 
 		Assert.Equal(mockPageType, mockPageServiceDescriptor.ServiceType);
-		Assert.Equal(mockPageViewModelType, mockViewModelServiceDescriptor.ServiceType);
+		Assert.Equal(mockViewModelType, mockViewModelServiceDescriptor.ServiceType);
 
 		Assert.Equal(mockPageType, mockPageServiceDescriptor.ImplementationType);
-		Assert.Equal(mockPageViewModelType, mockViewModelServiceDescriptor.ImplementationType);
+		Assert.Equal(mockViewModelType, mockViewModelServiceDescriptor.ImplementationType);
 
 		Assert.IsType<MockPage>(serviceProvider.GetRequiredService<MockPage>());
 		Assert.IsType<MockPageViewModel>(serviceProvider.GetRequiredService<MockPageViewModel>());
@@ -291,8 +452,8 @@ public void IServiceCollection_VerifyScopedShellRouteWithRouteAndRouteFactoryPar
 		var serviceProvider = services.BuildServiceProvider();
 
 		// Assert
-		var mockPageServiceDescriptor = services.Single(s => s.ServiceType.Equals(mockPageType) && s.Lifetime.Equals(expectedServiceLifetime));
-		var mockViewModelServiceDescriptor = services.Single(s => s.ServiceType.Equals(mockPageViewModelType) && s.Lifetime.Equals(expectedServiceLifetime));
+		var mockPageServiceDescriptor = services.Single(s => s.ServiceType == mockPageType && s.Lifetime.Equals(expectedServiceLifetime));
+		var mockViewModelServiceDescriptor = services.Single(s => s.ServiceType == mockViewModelType && s.Lifetime.Equals(expectedServiceLifetime));
 
 		Assert.NotNull(mockPageServiceDescriptor);
 		Assert.NotNull(mockViewModelServiceDescriptor);
@@ -303,10 +464,10 @@ public void IServiceCollection_VerifyScopedShellRouteWithRouteAndRouteFactoryPar
 		Assert.Equal(expectedServiceLifetime, mockViewModelServiceDescriptor.Lifetime);
 
 		Assert.Equal(mockPageType, mockPageServiceDescriptor.ServiceType);
-		Assert.Equal(mockPageViewModelType, mockViewModelServiceDescriptor.ServiceType);
+		Assert.Equal(mockViewModelType, mockViewModelServiceDescriptor.ServiceType);
 
 		Assert.Equal(mockPageType, mockPageServiceDescriptor.ImplementationType);
-		Assert.Equal(mockPageViewModelType, mockViewModelServiceDescriptor.ImplementationType);
+		Assert.Equal(mockViewModelType, mockViewModelServiceDescriptor.ImplementationType);
 
 		Assert.IsType<MockPage>(serviceProvider.GetRequiredService<MockPage>());
 		Assert.IsType<MockPageViewModel>(serviceProvider.GetRequiredService<MockPageViewModel>());
@@ -319,4 +480,6 @@ protected override void Dispose(bool isDisposing)
 		Routing.Clear();
 		base.Dispose(isDisposing);
 	}
+
+	sealed class MockPopup : View;
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.UnitTests/Mocks/MockPageViewModel.cs b/src/CommunityToolkit.Maui.UnitTests/Mocks/MockPageViewModel.cs
index 227359d82d..86c172c51b 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Mocks/MockPageViewModel.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Mocks/MockPageViewModel.cs
@@ -1,4 +1,6 @@
-namespace CommunityToolkit.Maui.UnitTests.Mocks;
+using CommunityToolkit.Maui.Core;
+
+namespace CommunityToolkit.Maui.UnitTests.Mocks;
 
 public class MockPageViewModel : BindableObject
 {
diff --git a/src/CommunityToolkit.Maui.UnitTests/Mocks/MockPopupHandler.cs b/src/CommunityToolkit.Maui.UnitTests/Mocks/MockPopupHandler.cs
deleted file mode 100644
index 407065186c..0000000000
--- a/src/CommunityToolkit.Maui.UnitTests/Mocks/MockPopupHandler.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using CommunityToolkit.Maui.Core;
-using Microsoft.Maui.Handlers;
-
-namespace CommunityToolkit.Maui.UnitTests.Mocks;
-
-public class MockPopupHandler : ElementHandler<IPopup, object>
-{
-	public static CommandMapper<IPopup, MockPopupHandler> PopUpCommandMapper = new(ElementCommandMapper)
-	{
-		[nameof(IPopup.OnOpened)] = MapOnOpened,
-		[nameof(IPopup.OnClosed)] = MapOnClosed,
-	};
-
-	public MockPopupHandler() : base(new PropertyMapper<IView>(), PopUpCommandMapper)
-	{
-
-	}
-
-	public MockPopupHandler(IPropertyMapper mapper) : base(mapper, PopUpCommandMapper)
-	{
-
-	}
-
-	public int OnOpenedCount { get; private set; }
-
-	protected override object CreatePlatformElement()
-	{
-		return new object();
-	}
-
-	static void MapOnOpened(MockPopupHandler arg1, IPopup arg2, object? arg3)
-	{
-		arg1.OnOpenedCount++;
-		arg2.OnOpened();
-	}
-
-	static void MapOnClosed(MockPopupHandler handler, IPopup view, object? result)
-	{
-		view.HandlerCompleteTCS.TrySetResult();
-	}
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.UnitTests/PopupServiceTests.cs b/src/CommunityToolkit.Maui.UnitTests/PopupServiceTests.cs
deleted file mode 100644
index 76d86dac98..0000000000
--- a/src/CommunityToolkit.Maui.UnitTests/PopupServiceTests.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-using System.ComponentModel;
-using CommunityToolkit.Maui.Core;
-using CommunityToolkit.Maui.UnitTests.Mocks;
-using CommunityToolkit.Maui.Views;
-using Xunit;
-
-namespace CommunityToolkit.Maui.UnitTests;
-
-public class PopupServiceTests : BaseHandlerTest
-{
-	[Fact]
-	public async Task ShowPopupAsyncWithNullOnPresentingShouldThrowArgumentNullException()
-	{
-		var popupService = ServiceProvider.GetRequiredService<IPopupService>();
-
-#pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
-		await Assert.ThrowsAsync<ArgumentNullException>(() =>
-			popupService.ShowPopupAsync<INotifyPropertyChanged>(onPresenting: null, TestContext.Current.CancellationToken));
-#pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
-	}
-
-	[Fact(Timeout = (int)TestDuration.Short)]
-	public async Task ShowPopupAsync_CancellationTokenExpired()
-	{
-		var popupService = ServiceProvider.GetRequiredService<IPopupService>();
-
-		var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(1));
-
-		// Ensure CancellationToken has expired
-		await Task.Delay(100, TestContext.Current.CancellationToken);
-
-		await Assert.ThrowsAsync<TaskCanceledException>(() => popupService.ShowPopupAsync<MockPageViewModel>(cts.Token));
-	}
-
-	[Fact(Timeout = (int)TestDuration.Short)]
-	public async Task ShowPopupAsync_CancellationTokenCanceled()
-	{
-		var popupService = ServiceProvider.GetRequiredService<IPopupService>();
-
-		var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(1));
-
-		// Ensure CancellationToken has expired
-		await cts.CancelAsync();
-
-		await Assert.ThrowsAsync<TaskCanceledException>(() => popupService.ShowPopupAsync<MockPageViewModel>(cts.Token));
-	}
-
-	[Fact(Timeout = (int)TestDuration.Medium)]
-	public async Task ShowPopupAsyncShouldValidateProperBindingContext()
-	{
-		var popupService = ServiceProvider.GetRequiredService<IPopupService>();
-		var popupInstance = ServiceProvider.GetRequiredService<MockSelfClosingPopup>();
-		var popupViewModel = ServiceProvider.GetRequiredService<MockPageViewModel>();
-
-		await popupService.ShowPopupAsync<MockPageViewModel>(TestContext.Current.CancellationToken);
-
-		Assert.Same(popupInstance.BindingContext, popupViewModel);
-	}
-
-	[Fact(Timeout = (int)TestDuration.Short)]
-	public async Task ShowPopupAsyncWithOnPresenting_CancellationTokenExpired()
-	{
-		var popupViewModel = new MockPageViewModel();
-		var popupInstance = new MockSelfClosingPopup(popupViewModel)
-		{
-			BindingContext = popupViewModel
-		};
-
-		var popupService = ServiceProvider.GetRequiredService<IPopupService>();
-
-		var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(1));
-
-		// Ensure CancellationToken has expired
-		await Task.Delay(100, TestContext.Current.CancellationToken);
-
-		await Assert.ThrowsAsync<TaskCanceledException>(() => popupService.ShowPopupAsync<MockPageViewModel>(viewModel => viewModel.HasLoaded = true, cts.Token));
-	}
-
-	[Fact(Timeout = (int)TestDuration.Short)]
-	public async Task ShowPopupAsyncWithOnPresenting_CancellationTokenCanceled()
-	{
-		var popupService = ServiceProvider.GetRequiredService<IPopupService>();
-
-		var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(1));
-
-		// Ensure CancellationToken has expired
-		await cts.CancelAsync();
-
-		await Assert.ThrowsAsync<TaskCanceledException>(() => popupService.ShowPopupAsync<MockPageViewModel>(viewModel => viewModel.HasLoaded = true, cts.Token));
-	}
-
-	[Fact(Timeout = (int)TestDuration.Medium)]
-	public async Task ShowPopupAsyncWithOnPresentingShouldBeInvoked()
-	{
-		var popupService = ServiceProvider.GetRequiredService<IPopupService>();
-		var popupViewModel = ServiceProvider.GetRequiredService<MockPageViewModel>();
-
-		await popupService.ShowPopupAsync<MockPageViewModel>(onPresenting: viewModel => viewModel.HasLoaded = true, TestContext.Current.CancellationToken);
-
-		Assert.True(popupViewModel.HasLoaded);
-	}
-
-	[Fact(Timeout = (int)TestDuration.Medium)]
-	public async Task ShowPopupAsyncShouldReturnResultOnceClosed()
-	{
-		var mockPopup = ServiceProvider.GetRequiredService<MockSelfClosingPopup>();
-		var popupService = ServiceProvider.GetRequiredService<IPopupService>();
-
-		var result = await popupService.ShowPopupAsync<MockPageViewModel>(TestContext.Current.CancellationToken);
-
-		Assert.Same(mockPopup.Result, result);
-	}
-
-	[Fact]
-	public void ShowPopupWithNullOnPresentingShouldThrowArgumentNullException()
-	{
-		var popupService = new PopupService(ServiceProvider, new MockDispatcherProvider());
-
-#pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
-		Assert.Throws<ArgumentNullException>(() => popupService.ShowPopup<INotifyPropertyChanged>(onPresenting: null));
-#pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
-	}
-
-	[Fact]
-	public void ShowPopupWithOnPresentingShouldBeInvoked()
-	{
-		var popupService = ServiceProvider.GetRequiredService<IPopupService>();
-		var popupViewModel = ServiceProvider.GetRequiredService<MockPageViewModel>();
-
-		popupService.ShowPopup<MockPageViewModel>(onPresenting: viewModel => viewModel.HasLoaded = true);
-
-		Assert.True(popupViewModel.HasLoaded);
-	}
-
-	sealed class UnregisteredViewModel : INotifyPropertyChanged
-	{
-		public event PropertyChangedEventHandler? PropertyChanged;
-	}
-}
-
-sealed class MockSelfClosingPopup : Popup
-{
-	public MockSelfClosingPopup(MockPageViewModel viewModel, object? result = null)
-	{
-		BindingContext = viewModel;
-		Result = result;
-	}
-
-	public new object? Result { get; }
-
-	internal override async void OnOpened()
-	{
-		base.OnOpened();
-
-		await Task.Delay(TimeSpan.FromMilliseconds(500));
-
-		Close(Result);
-	}
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.UnitTests/Services/PopupServiceTests.cs b/src/CommunityToolkit.Maui.UnitTests/Services/PopupServiceTests.cs
new file mode 100644
index 0000000000..b487318d40
--- /dev/null
+++ b/src/CommunityToolkit.Maui.UnitTests/Services/PopupServiceTests.cs
@@ -0,0 +1,335 @@
+using System.ComponentModel;
+using CommunityToolkit.Maui.Services;
+using CommunityToolkit.Maui.UnitTests.Mocks;
+using CommunityToolkit.Maui.Views;
+using Microsoft.Maui.Controls.Shapes;
+using Xunit;
+
+namespace CommunityToolkit.Maui.UnitTests.Services;
+
+public class PopupServiceTests : BaseHandlerTest
+{
+	readonly INavigation navigation;
+
+	public PopupServiceTests()
+	{
+		var page = new MockPage(new MockPageViewModel());
+		Assert.NotNull(Application.Current);
+
+		Application.Current.Windows[0].Page = page;
+		navigation = page.Navigation;
+	}
+
+	[Fact]
+	public void AddPopup_RegistersViewInServiceCollection()
+	{
+		// Arrange
+		var services = new ServiceCollection();
+
+		// Act
+		PopupService.AddPopup<MockPopup>(services, ServiceLifetime.Transient);
+
+		// Assert
+		var serviceDescriptor = Assert.Single(services);
+		Assert.Equal(typeof(MockPopup), serviceDescriptor.ServiceType);
+		Assert.Equal(ServiceLifetime.Transient, serviceDescriptor.Lifetime);
+	}
+
+	[Fact]
+	public void AddPopup_WithViewModel_RegistersBothViewAndViewModel()
+	{
+		// Arrange
+		var services = new ServiceCollection();
+
+		// Act
+		PopupService.AddPopup<MockPopup, PopupViewModel>(services, ServiceLifetime.Transient);
+
+		// Assert
+		Assert.Equal(2, services.Count);
+		Assert.Contains(services, sd => sd.ServiceType == typeof(MockPopup));
+		Assert.Contains(services, sd => sd.ServiceType == typeof(PopupViewModel));
+	}
+
+	[Fact]
+	public void ShowPopupAsync_WithViewType_ShowsPopup()
+	{
+		// Arrange
+		var popupService = ServiceProvider.GetRequiredService<IPopupService>();
+
+		// Act
+		popupService.ShowPopup<MockSelfClosingPopup>(navigation);
+
+		// Assert
+		Assert.Single(navigation.ModalStack);
+		Assert.IsType<PopupPage>(navigation.ModalStack[0]);
+	}
+
+	[Fact(Timeout = (int)TestDuration.Short)]
+	public async Task ShowPopupAsync_AwaitingShowPopupAsync_EnsurePreviousPopupClosed()
+	{
+		// Arrange
+		var popupService = ServiceProvider.GetRequiredService<IPopupService>();
+
+		// Act
+		await popupService.ShowPopupAsync<MockSelfClosingPopup>(navigation, PopupOptions.Empty, CancellationToken.None);
+		await popupService.ShowPopupAsync<MockSelfClosingPopup>(navigation, PopupOptions.Empty, CancellationToken.None);
+
+		// Assert
+		Assert.Empty(navigation.ModalStack);
+	}
+
+	[Fact]
+	public void ShowPopup_NavigationModalStackCountIncreases()
+	{
+		// Arrange
+		var popupService = ServiceProvider.GetRequiredService<IPopupService>();
+		Assert.Empty(navigation.ModalStack);
+
+		// Act
+		popupService.ShowPopup<MockSelfClosingPopup>(navigation, PopupOptions.Empty);
+
+		// Assert
+		Assert.Single(navigation.ModalStack);
+	}
+
+	[Fact]
+	public void ShowPopup_MultiplePopupsDisplayed()
+	{
+		// Arrange
+		var popupService = ServiceProvider.GetRequiredService<IPopupService>();
+
+		// Act
+		popupService.ShowPopup<MockSelfClosingPopup>(navigation, PopupOptions.Empty);
+		popupService.ShowPopup<MockSelfClosingPopup>(navigation, PopupOptions.Empty);
+
+		// Assert
+		Assert.Equal(2, navigation.ModalStack.Count);
+	}
+
+	[Fact]
+	public void ShowPopupAsync_WithCustomOptions_AppliesOptions()
+	{
+		// Arrange
+		var onTappingOutsideOfPopup = () => { };
+
+		var popupService = ServiceProvider.GetRequiredService<IPopupService>();
+		var options = new PopupOptions
+		{
+			PageOverlayColor = Colors.Red,
+			CanBeDismissedByTappingOutsideOfPopup = false,
+			Shape = new Ellipse(),
+			OnTappingOutsideOfPopup = onTappingOutsideOfPopup
+		};
+
+		// Act
+		popupService.ShowPopup<MockSelfClosingPopup>(
+			navigation,
+			options);
+
+		var popupPage = (PopupPage)navigation.ModalStack[0];
+		var popupPageLayout = popupPage.Content;
+		var border = (Border)popupPageLayout.Children[0];
+		var popup = border.Content;
+
+		// Assert
+		Assert.NotNull(popup);
+
+		Assert.Equal(popup.HorizontalOptions, border.HorizontalOptions);
+		Assert.Equal(popup.VerticalOptions, border.VerticalOptions);
+		Assert.Equal(popup.Margin, border.Margin);
+		Assert.Equal(border.Padding, border.Padding);
+		Assert.Equal(options.PageOverlayColor, popupPage.BackgroundColor);
+		Assert.Equal(options.Shape, border.StrokeShape);
+		Assert.Equal(popup.BindingContext, border.BindingContext);
+		Assert.Equal(popupPageLayout.BindingContext, border.BindingContext);
+	}
+
+	[Fact(Timeout = (int)TestDuration.Short)]
+	public async Task ShowPopupAsyncWithNotRegisteredServiceShouldThrowInvalidOperationException()
+	{
+		var popupService = ServiceProvider.GetRequiredService<IPopupService>();
+
+		if (Application.Current?.Windows[0].Page is not Page page)
+		{
+			throw new InvalidOperationException("Page cannot be null");
+		}
+
+		await Assert.ThrowsAsync<InvalidOperationException>(() => popupService.ShowPopupAsync<INotifyPropertyChanged>(page.Navigation, PopupOptions.Empty, TestContext.Current.CancellationToken));
+	}
+
+	[Fact(Timeout = (int)TestDuration.Short)]
+	public async Task ShowPopupAsync_CancellationTokenExpired()
+	{
+		var popupService = ServiceProvider.GetRequiredService<IPopupService>();
+
+		var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(1));
+
+		// Ensure CancellationToken has expired
+		await Task.Delay(100, CancellationToken.None);
+
+		if (Application.Current?.Windows[0].Page is not Page page)
+		{
+			throw new InvalidOperationException("Page cannot be null");
+		}
+
+		await Assert.ThrowsAsync<OperationCanceledException>(() => popupService.ShowPopupAsync<MockPageViewModel>(page.Navigation, PopupOptions.Empty, cts.Token));
+	}
+
+	[Fact(Timeout = (int)TestDuration.Short)]
+	public async Task ShowPopupAsync_CancellationTokenCanceled()
+	{
+		var popupService = ServiceProvider.GetRequiredService<IPopupService>();
+
+		var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(1));
+
+		// Ensure CancellationToken has expired
+		await cts.CancelAsync();
+
+		await Assert.ThrowsAsync<OperationCanceledException>(() => popupService.ShowPopupAsync<MockPageViewModel>(navigation, PopupOptions.Empty, cts.Token));
+	}
+
+	[Fact(Timeout = (int)TestDuration.Medium)]
+	public async Task ShowPopupAsyncShouldValidateProperBindingContext()
+	{
+		var popupService = ServiceProvider.GetRequiredService<IPopupService>();
+		var popupInstance = ServiceProvider.GetRequiredService<MockSelfClosingPopup>();
+		var popupViewModel = ServiceProvider.GetRequiredService<MockPageViewModel>();
+
+		if (Application.Current?.Windows[0].Page is not Page page)
+		{
+			throw new InvalidOperationException("Page cannot be null");
+		}
+
+		await popupService.ShowPopupAsync<MockPageViewModel, object?>(page.Navigation, PopupOptions.Empty, TestContext.Current.CancellationToken);
+
+		Assert.Same(popupInstance.BindingContext, popupViewModel);
+	}
+
+	[Fact(Timeout = (int)TestDuration.Medium)]
+	public async Task ShowPopupAsyncShouldReturnResultOnceClosed()
+	{
+		var mockPopup = ServiceProvider.GetRequiredService<MockSelfClosingPopup>();
+		var popupService = ServiceProvider.GetRequiredService<IPopupService>();
+
+		if (Application.Current?.Windows[0].Page is not Page page)
+		{
+			throw new InvalidOperationException("Page cannot be null");
+		}
+
+		var result = await popupService.ShowPopupAsync<MockPageViewModel, object?>(page.Navigation, PopupOptions.Empty, CancellationToken.None);
+
+		Assert.Same(mockPopup.Result, result.Result);
+		Assert.False(result.WasDismissedByTappingOutsideOfPopup);
+	}
+
+	[Fact(Timeout = (int)TestDuration.Medium)]
+	public async Task ShowPopupTAsyncShouldReturnResultOnceClosed()
+	{
+		var popupService = ServiceProvider.GetRequiredService<IPopupService>();
+
+		if (Application.Current?.Windows[0].Page is not Page page)
+		{
+			throw new InvalidOperationException("Page cannot be null");
+		}
+
+		var result = await popupService.ShowPopupAsync<MockPageViewModel>(page.Navigation, PopupOptions.Empty, CancellationToken.None);
+
+		Assert.False(result.WasDismissedByTappingOutsideOfPopup);
+	}
+
+	[Fact(Timeout = (int)TestDuration.Short)]
+	public async Task ShowPopupAsync_ShouldThrowArgumentNullException_WhenNavigationIsNull()
+	{
+		var popupService = ServiceProvider.GetRequiredService<IPopupService>();
+
+#pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
+		await Assert.ThrowsAsync<ArgumentNullException>(() => popupService.ShowPopupAsync<MockPageViewModel>(null, PopupOptions.Empty, CancellationToken.None));
+#pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
+	}
+
+	[Fact(Timeout = (int)TestDuration.Short)]
+	public async Task ShowPopupAsync_ShouldThrowArgumentNullException_WhenViewModelIsNull()
+	{
+		var popupService = ServiceProvider.GetRequiredService<IPopupService>();
+
+		if (Application.Current?.Windows[0].Page is not Page page)
+		{
+			throw new InvalidOperationException("Page cannot be null");
+		}
+
+		await Assert.ThrowsAsync<InvalidOperationException>(() => popupService.ShowPopupAsync<object>(page.Navigation, PopupOptions.Empty, CancellationToken.None));
+	}
+
+	[Fact(Timeout = (int)TestDuration.Short)]
+	public async Task ShowPopupAsync_ShouldReturnDefaultResult_WhenPopupIsClosedWithoutResult()
+	{
+		var popupService = ServiceProvider.GetRequiredService<IPopupService>();
+		var mockPopup = ServiceProvider.GetRequiredService<MockSelfClosingPopup>();
+
+		if (Application.Current?.Windows[0].Page is not Page page)
+		{
+			throw new InvalidOperationException("Page cannot be null");
+		}
+
+		var result = await popupService.ShowPopupAsync<MockPageViewModel, object?>(page.Navigation, PopupOptions.Empty, CancellationToken.None);
+
+		Assert.Equal(mockPopup.Result, result.Result);
+	}
+}
+
+sealed class MockSelfClosingPopup : Popup<object?>
+{
+	public MockSelfClosingPopup(MockPageViewModel viewModel, object? result = null)
+	{
+		BackgroundColor = Colors.White;
+		BindingContext = viewModel;
+		Result = result;
+		Opened += HandlePopupOpened;
+	}
+
+	void HandlePopupOpened(object? sender, EventArgs e)
+	{
+		var timer = Dispatcher.CreateTimer();
+		timer.Interval = TimeSpan.FromMilliseconds(500);
+		timer.Tick += HandleTick;
+		timer.Start();
+
+		async void HandleTick(object? sender, EventArgs e)
+		{
+			timer.Tick -= HandleTick;
+			try
+			{
+				await Close(Result);
+			}
+			catch (InvalidOperationException)
+			{
+				// If test has already ended, Popup.Close will throw an InvalidOperationException
+				// because all Popups are removed from ModalStack in BaseHandlerTest.DisposeAsyncCore()
+			}
+		}
+	}
+
+	public object? Result { get; }
+}
+
+sealed file class MockPopup : Popup
+{
+}
+
+sealed file class PopupViewModel : INotifyPropertyChanged
+{
+	public event PropertyChangedEventHandler? PropertyChanged;
+
+	public Color? Color
+	{
+		get;
+		set
+		{
+			if (!Equals(value, field))
+			{
+				field = value;
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Color)));
+			}
+		}
+	} = new();
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.UnitTests/Views/Popup/PopupOptionsTests.cs b/src/CommunityToolkit.Maui.UnitTests/Views/Popup/PopupOptionsTests.cs
new file mode 100644
index 0000000000..20c7b39119
--- /dev/null
+++ b/src/CommunityToolkit.Maui.UnitTests/Views/Popup/PopupOptionsTests.cs
@@ -0,0 +1,181 @@
+using Microsoft.Maui.Controls.Shapes;
+using Xunit;
+
+namespace CommunityToolkit.Maui.UnitTests.Views;
+
+public class PopupOptionsTests : BaseTest
+{
+	[Fact]
+	public void CanBeDismissedByTappingOutsideOfPopup_DefaultValue_ShouldBeTrue()
+	{
+		var popupOptions = new PopupOptions();
+		Assert.Equal(PopupOptionsDefaults.CanBeDismissedByTappingOutsideOfPopup, popupOptions.CanBeDismissedByTappingOutsideOfPopup);
+	}
+
+	[Fact]
+	public void CanBeDismissedByTappingOutsideOfPopup_SetValue_ShouldBeUpdated()
+	{
+		var popupOptions = new PopupOptions();
+		popupOptions.CanBeDismissedByTappingOutsideOfPopup = false;
+		Assert.False(popupOptions.CanBeDismissedByTappingOutsideOfPopup);
+	}
+
+	[Fact]
+	public void Shadow_DefaultValue_ShouldBeTrue()
+	{
+		var popupOptions = new PopupOptions();
+		Assert.Equal(PopupOptionsDefaults.Shadow, popupOptions.Shadow);
+	}
+
+	[Fact]
+	public void Shadow_SetValue_ShouldBeUpdated()
+	{
+		var popupOptions = new PopupOptions();
+		popupOptions.Shadow = null;
+		Assert.Null(popupOptions.Shadow);
+	}
+
+	[Fact]
+	public void PageOverlayColor_DefaultValue_ShouldBeDefaultColor()
+	{
+		var popupOptions = new PopupOptions();
+		Assert.Equal(PopupOptionsDefaults.PageOverlayColor, popupOptions.PageOverlayColor);
+	}
+
+	[Fact]
+	public void PageOverlayColor_SetValue_ShouldBeUpdated()
+	{
+		var popupOptions = new PopupOptions();
+		var color = Colors.Red;
+		popupOptions.PageOverlayColor = color;
+		Assert.Equal(color, popupOptions.PageOverlayColor);
+	}
+
+	[Fact]
+	public void BorderStroke_DefaultValue_ShouldBeDefaultStroke()
+	{
+		var popupOptions = new PopupOptions();
+		Assert.Equal(PopupOptionsDefaults.BorderStroke, popupOptions.Shape?.Stroke);
+	}
+
+	[Fact]
+	public void OnTappingOutsideOfPopup_DefaultValue_ShouldBeNull()
+	{
+		var popupOptions = new PopupOptions();
+		Assert.Equal(PopupOptionsDefaults.OnTappingOutsideOfPopup, popupOptions.OnTappingOutsideOfPopup);
+	}
+
+	[Fact]
+	public void OnTappingOutsideOfPopup_SetValue_ShouldBeUpdated()
+	{
+		var popupOptions = new PopupOptions();
+		Action action = () => { };
+		popupOptions.OnTappingOutsideOfPopup = action;
+		Assert.Equal(action, popupOptions.OnTappingOutsideOfPopup);
+	}
+
+	[Fact]
+	public void Shape_DefaultValue_ShouldBeNull()
+	{
+		var popupOptions = new PopupOptions();
+		Assert.Equal(PopupOptionsDefaults.Shape, popupOptions.Shape);
+	}
+
+	[Fact]
+	public void CanBeDismissedByTappingOutsideOfPopup_ShouldReturnTrue()
+	{
+		var options = new MockPopupOptions { CanBeDismissedByTappingOutsideOfPopup = true };
+		Assert.True(options.CanBeDismissedByTappingOutsideOfPopup);
+	}
+
+	[Fact]
+	public void CanBeDismissedByTappingOutsideOfPopup_ShouldReturnFalse()
+	{
+		var options = new MockPopupOptions { CanBeDismissedByTappingOutsideOfPopup = false };
+		Assert.False(options.CanBeDismissedByTappingOutsideOfPopup);
+	}
+
+	[Fact]
+	public void BorderStroke_ShouldReturnCorrectColor()
+	{
+		var color = Colors.Red;
+		var options = new MockPopupOptions
+		{
+			Shape = new Ellipse
+			{
+				Stroke = color
+			}
+		};
+		Assert.Equal(color, options.Shape.Stroke);
+	}
+
+	[Fact]
+	public void PageOverylayColor_ShouldReturnCorrectColor()
+	{
+		var color = Colors.Red;
+		var options = new MockPopupOptions { PageOverlayColor = color };
+		Assert.Equal(color, options.PageOverlayColor);
+	}
+
+	[Fact]
+	public void OnTappingOutsideOfPopup_ShouldInvokeAction()
+	{
+		bool actionInvoked = false;
+		var options = new MockPopupOptions { OnTappingOutsideOfPopup = () => actionInvoked = true };
+		options.OnTappingOutsideOfPopup?.Invoke();
+		Assert.True(actionInvoked);
+	}
+
+	[Fact]
+	public void Shape_ShouldReturnCorrectShape()
+	{
+		var shape = new Rectangle();
+		var options = new MockPopupOptions { Shape = shape };
+		Assert.Equal(shape, options.Shape);
+	}
+
+	[Fact]
+	public void Margin_ShouldReturnCorrectThickness()
+	{
+		var margin = new Thickness(10);
+		var options = new MockPopupOptions { Margin = margin };
+		Assert.Equal(margin, options.Margin);
+	}
+
+	[Fact]
+	public void Padding_ShouldReturnCorrectThickness()
+	{
+		var padding = new Thickness(5);
+		var options = new MockPopupOptions { Padding = padding };
+		Assert.Equal(padding, options.Padding);
+	}
+
+	[Fact]
+	public void VerticalOptions_ShouldReturnCorrectLayoutOptions()
+	{
+		var verticalOptions = LayoutOptions.Center;
+		var options = new MockPopupOptions { VerticalOptions = verticalOptions };
+		Assert.Equal(verticalOptions, options.VerticalOptions);
+	}
+
+	[Fact]
+	public void HorizontalOptions_ShouldReturnCorrectLayoutOptions()
+	{
+		var horizontalOptions = LayoutOptions.End;
+		var options = new MockPopupOptions { HorizontalOptions = horizontalOptions };
+		Assert.Equal(horizontalOptions, options.HorizontalOptions);
+	}
+
+	sealed class MockPopupOptions : IPopupOptions
+	{
+		public bool CanBeDismissedByTappingOutsideOfPopup { get; set; }
+		public Color PageOverlayColor { get; set; } = Colors.Transparent;
+		public Action? OnTappingOutsideOfPopup { get; set; }
+		public Shape? Shape { get; set; }
+		public Thickness Margin { get; set; }
+		public Thickness Padding { get; set; }
+		public LayoutOptions VerticalOptions { get; set; }
+		public LayoutOptions HorizontalOptions { get; set; }
+		public Shadow? Shadow { get; set; } = null;
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.UnitTests/Views/Popup/PopupPageTests.cs b/src/CommunityToolkit.Maui.UnitTests/Views/Popup/PopupPageTests.cs
new file mode 100644
index 0000000000..051eb2810f
--- /dev/null
+++ b/src/CommunityToolkit.Maui.UnitTests/Views/Popup/PopupPageTests.cs
@@ -0,0 +1,386 @@
+using CommunityToolkit.Maui.Core;
+using CommunityToolkit.Maui.Extensions;
+using CommunityToolkit.Maui.Views;
+using FluentAssertions;
+using Microsoft.Maui.Controls.PlatformConfiguration;
+using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
+using Microsoft.Maui.Controls.Shapes;
+using Xunit;
+using Application = Microsoft.Maui.Controls.Application;
+using Page = Microsoft.Maui.Controls.Page;
+
+namespace CommunityToolkit.Maui.UnitTests.Views;
+
+public class PopupPageTests : BaseHandlerTest
+{
+	[Fact]
+	public void Constructor_ShouldThrowArgumentNullException_WhenPopupIsNull()
+	{
+		// Arrange
+		var popupOptions = new MockPopupOptions();
+		var taskCompletionSource = new TaskCompletionSource<PopupResult>();
+
+		// Act
+#pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
+		Action act = () => new PopupPage(null, popupOptions);
+#pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
+
+		// Assert
+		act.Should().Throw<ArgumentNullException>();
+	}
+
+	[Fact]
+	public void Constructor_ShouldThrowArgumentNullException_WhenPopupOptionsIsNull()
+	{
+		// Arrange
+		var view = new ContentView();
+		var taskCompletionSource = new TaskCompletionSource<PopupResult>();
+
+		// Act
+#pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
+		Action act = () => new PopupPage(view, null);
+#pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
+
+		// Assert
+		act.Should().Throw<ArgumentNullException>();
+	}
+
+	[Fact]
+	public async Task Close_ShouldThrowInvalidOperationException_NoPopupPageFound()
+	{
+		// Arrange
+		var view = new ContentView();
+		var popupOptions = new MockPopupOptions();
+		var popupPage = new PopupPage<string>(view, popupOptions);
+
+		// Act / Assert
+		await Assert.ThrowsAsync<PopupNotFoundException>(async () => await popupPage.Close(new PopupResult(false), CancellationToken.None));
+		await Assert.ThrowsAnyAsync<InvalidOperationException>(async () => await popupPage.Close(new PopupResult(false), CancellationToken.None));
+	}
+
+	[Fact]
+	public async Task Close_ShouldSetResultAndPopModalAsync()
+	{
+		// Arrange
+		var tcs = new TaskCompletionSource<IPopupResult>();
+		var view = new ContentView();
+		var popupOptions = new MockPopupOptions();
+		var popupPage = new PopupPage(view, popupOptions);
+		var expectedResult = new PopupResult(false);
+
+		popupPage.PopupClosed += HandlePopupClosed;
+
+		// Act
+		if (Application.Current?.Windows[0].Page?.Navigation is not INavigation navigation)
+		{
+			throw new InvalidOperationException("Unable to locate Navigation page");
+		}
+
+		await navigation.PushModalAsync(popupPage);
+
+		await popupPage.Close(expectedResult, CancellationToken.None);
+		var actualResult = await tcs.Task;
+
+		// Assert
+		actualResult.Should().Be(expectedResult);
+
+		void HandlePopupClosed(object? sender, IPopupResult e)
+		{
+			tcs.SetResult(e);
+		}
+	}
+
+	[Fact(Timeout = (int)TestDuration.Short)]
+	public async Task Close_ShouldThrowOperationCanceledException_WhenTokenIsCancelled_NavigationModalStackShouldStillContainPopupPage()
+	{
+		// Arrange
+		PopupPage popupPage;
+		var view = new ContentView();
+		var result = new PopupResult(false);
+		var cts = new CancellationTokenSource();
+		if (Application.Current?.Windows[0].Page is not Page mainPage)
+		{
+			throw new InvalidOperationException("Failed to locate main page");
+		}
+		
+		// Act
+		mainPage.Navigation.ShowPopup(view);
+		popupPage = mainPage.Navigation.ModalStack.OfType<PopupPage>().Single();
+		
+		await cts.CancelAsync();
+		
+		// Assert
+		await Assert.ThrowsAnyAsync<OperationCanceledException>(() => popupPage.Close(result, cts.Token));
+		Assert.Single(mainPage.Navigation.ModalStack.OfType<PopupPage>());
+	}
+
+	[Fact]
+	public void PopupPageT_Constructor_ShouldThrowArgumentNullException_WhenPopupIsNull()
+	{
+		// Arrange
+		var popupOptions = new MockPopupOptions();
+
+		// Act
+#pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
+		Action act = () => new PopupPage<string>(null, popupOptions);
+#pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
+
+		// Assert
+		act.Should().Throw<ArgumentNullException>();
+	}
+
+	[Fact]
+	public void PopupPageT_Constructor_ShouldThrowArgumentNullException_WhenPopupOptionsIsNull()
+	{
+		// Arrange
+		var view = new ContentView();
+
+		// Act
+#pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
+		Action act = () => new PopupPage<string>(view, null);
+#pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
+
+		// Assert
+		act.Should().Throw<ArgumentNullException>();
+	}
+
+	[Fact]
+	public async Task PopupPageT_Close_ShouldSetResultAndPopModalAsync()
+	{
+		// Arrange
+		var view = new ContentView();
+		var popupOptions = new MockPopupOptions();
+		var taskCompletionSource = new TaskCompletionSource<PopupResult<string>>();
+		var popupPage = new PopupPage<string>(view, popupOptions);
+		var expectedResult = new PopupResult<string>("Test", false);
+
+		popupPage.PopupClosed += HandlePopupClosed;
+
+		// Act
+		if (Application.Current?.Windows[0].Page?.Navigation is not INavigation navigation)
+		{
+			throw new InvalidOperationException("Unable to locate Navigation page");
+		}
+
+		await navigation.PushModalAsync(popupPage);
+
+		await popupPage.Close(expectedResult, CancellationToken.None);
+		var actualResult = await taskCompletionSource.Task;
+
+		// Assert
+		actualResult.Should().Be(expectedResult);
+
+		void HandlePopupClosed(object? sender, IPopupResult e)
+		{
+			taskCompletionSource.SetResult((PopupResult<string>)e);
+		}
+	}
+
+	[Fact]
+	public async Task PopupPageT_CloseAfterAdditionalModalPage_ShouldThrowInvalidOperationException()
+	{
+		// Arrange
+		var view = new ContentView();
+		var popupOptions = new MockPopupOptions();
+		var popupPage = new PopupPage<string>(view, popupOptions);
+
+		// Act
+		if (Application.Current?.Windows[0].Page?.Navigation is not INavigation navigation)
+		{
+			throw new InvalidOperationException("Unable to locate Navigation page");
+		}
+
+		await navigation.PushModalAsync(popupPage);
+		await navigation.PushModalAsync(new ContentPage());
+
+		// Assert
+		await Assert.ThrowsAsync<InvalidPopupOperationException>(async () => await popupPage.Close(new PopupResult(false), CancellationToken.None));
+		await Assert.ThrowsAnyAsync<InvalidOperationException>(async () => await popupPage.Close(new PopupResult(false), CancellationToken.None));
+	}
+
+	[Fact]
+	public void PopupPageT_Close_ShouldThrowOperationCanceledException_WhenTokenIsCancelled()
+	{
+		// Arrange
+		var view = new ContentView();
+		var popupOptions = new MockPopupOptions();
+		var popupPage = new PopupPage<string>(view, popupOptions);
+		var result = new PopupResult<string>("Test", false);
+		var cts = new CancellationTokenSource();
+		cts.Cancel();
+
+		// Act
+		Func<Task> act = async () => await popupPage.Close(result, cts.Token);
+
+		// Assert
+		act.Should().ThrowAsync<OperationCanceledException>();
+	}
+
+	[Fact]
+	public void Constructor_WithViewAndPopupOptions_SetsCorrectProperties()
+	{
+		// Arrange
+		var view = new Label { Text = "Test Popup Content" };
+		var popupOptions = new MockPopupOptions
+		{
+			CanBeDismissedByTappingOutsideOfPopup = true,
+			PageOverlayColor = Colors.Red,
+			Margin = new Thickness(10),
+			Padding = new Thickness(5),
+			VerticalOptions = LayoutOptions.Center,
+			HorizontalOptions = LayoutOptions.Center,
+			Shape = new RoundRectangle { CornerRadius = new CornerRadius(10) },
+		};
+
+		// Act
+		var popupPage = new PopupPage(view, popupOptions);
+
+		// Assert
+		Assert.NotNull(popupPage.Content);
+		Assert.IsType<PopupPage.PopupPageLayout>(popupPage.Content);
+
+		// Verify iOS platform specific settings
+		Assert.Equal(PresentationMode.ModalNotAnimated, Shell.GetPresentationMode(popupPage));
+		Assert.Equal(UIModalPresentationStyle.OverFullScreen, popupPage.On<iOS>().ModalPresentationStyle());
+
+		// Verify content has tap gesture recognizer attached
+		Assert.Single(popupPage.Content.GestureRecognizers);
+		Assert.IsType<TapGestureRecognizer>(popupPage.Content.GestureRecognizers[0]);
+
+		// Verify PopupPageLayout structure
+		var pageContent = popupPage.Content;
+		Assert.Single(pageContent.Children);
+		Assert.IsType<Border>(pageContent.Children[0]);
+
+		// Verify content binding context is set correctly
+		Assert.Equal(view.BindingContext, pageContent.BindingContext);
+	}
+
+	[Fact]
+	public void Constructor_WithNullView_ThrowsArgumentNullException()
+	{
+		// Arrange
+		var popupOptions = new MockPopupOptions();
+
+		// Act & Assert
+#pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
+		Assert.Throws<ArgumentNullException>(() => new PopupPage((View?)null, popupOptions));
+#pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
+	}
+
+	[Fact]
+	public void Constructor_WithNullPopup_ThrowsArgumentNullException()
+	{
+		// Arrange
+		var popupOptions = new MockPopupOptions();
+
+		// Act & Assert
+#pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
+		Assert.Throws<ArgumentNullException>(() => new PopupPage((Popup?)null, popupOptions));
+#pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
+	}
+
+	[Fact]
+	public void Constructor_WithNullPopupOptions_ThrowsArgumentNullException()
+	{
+		// Arrange
+		var view = new Label();
+		IPopupOptions popupOptions = null!;
+
+		// Act & Assert
+		Assert.Throws<ArgumentNullException>(() => new PopupPage(view, popupOptions));
+	}
+
+	[Fact]
+	public async Task TapGestureRecognizer_ShouldClosePopupWhenCanBeDismissedIsTrue()
+	{
+		// Arrange
+		bool actionInvoked = false;
+		var actionInvokedTCS = new TaskCompletionSource<bool>();
+		var view = new Label { Text = "Test Popup Content" };
+		var popupOptions = new MockPopupOptions
+		{
+			CanBeDismissedByTappingOutsideOfPopup = true,
+			OnTappingOutsideOfPopup = () =>
+			{
+				actionInvoked = true;
+				actionInvokedTCS.SetResult(actionInvoked);
+			}
+		};
+
+		var popupPage = new PopupPage(view, popupOptions);
+
+		var tapGestureRecognizer = (TapGestureRecognizer)popupPage.Content.GestureRecognizers[0];
+		var command = tapGestureRecognizer.Command;
+		Assert.NotNull(command);
+
+		// Act & Assert
+		Assert.True(command.CanExecute(null));
+		popupOptions.OnTappingOutsideOfPopup?.Invoke();
+
+		var result = await actionInvokedTCS.Task;
+
+		Assert.True(result);
+		Assert.True(actionInvoked);
+	}
+
+	[Fact]
+	public void TapGestureRecognizer_ShouldNotExecuteWhenCanBeDismissedIsFalse()
+	{
+		// Arrange
+		var view = new Label { Text = "Test Popup Content" };
+		var popupOptions = new MockPopupOptions
+		{
+			CanBeDismissedByTappingOutsideOfPopup = false
+		};
+
+		var popupPage = new PopupPage(view, popupOptions);
+		var tapGestureRecognizer = (TapGestureRecognizer)popupPage.Content.GestureRecognizers[0];
+		var command = tapGestureRecognizer.Command;
+
+		// Act & Assert
+		Assert.NotNull(command);
+		Assert.False(command.CanExecute(null));
+	}
+
+	[Fact]
+	public void OnBackButtonPressed_ReturnsTrueWhenCanBeDismissedIsFalse()
+	{
+		// Arrange
+		var view = new Label { Text = "Test Popup Content" };
+		var popupOptions = new MockPopupOptions
+		{
+			CanBeDismissedByTappingOutsideOfPopup = false
+		};
+
+		var popupPage = new TestablePopupPage(view, popupOptions);
+
+		// Act
+		var result = popupPage.TestOnBackButtonPressed();
+
+		// Assert
+		Assert.True(result);
+	}
+
+	// Helper class for testing protected methods
+	sealed class TestablePopupPage(View view, IPopupOptions popupOptions) : PopupPage(view, popupOptions)
+	{
+		public bool TestOnBackButtonPressed()
+		{
+			return OnBackButtonPressed();
+		}
+	}
+
+	sealed class MockPopupOptions : IPopupOptions
+	{
+		public bool CanBeDismissedByTappingOutsideOfPopup { get; set; }
+		public Color PageOverlayColor { get; set; } = Colors.Transparent;
+		public Action? OnTappingOutsideOfPopup { get; set; }
+		public Shape? Shape { get; set; }
+		public Thickness Margin { get; set; } = new Thickness(0);
+		public Thickness Padding { get; set; } = new Thickness(0);
+		public LayoutOptions VerticalOptions { get; set; } = LayoutOptions.Center;
+		public LayoutOptions HorizontalOptions { get; set; } = LayoutOptions.Center;
+		public Shadow? Shadow { get; set; } = null;
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.UnitTests/Views/Popup/PopupResultTests.cs b/src/CommunityToolkit.Maui.UnitTests/Views/Popup/PopupResultTests.cs
new file mode 100644
index 0000000000..642d3d0b59
--- /dev/null
+++ b/src/CommunityToolkit.Maui.UnitTests/Views/Popup/PopupResultTests.cs
@@ -0,0 +1,96 @@
+using CommunityToolkit.Maui.Core;
+using CommunityToolkit.Maui.Views;
+using Xunit;
+
+namespace CommunityToolkit.Maui.UnitTests.Views;
+
+public class PopupResultTests : BaseTest
+{
+	[Fact]
+	public void PopupResult_Constructor_SetsProperties()
+	{
+		// Arrange
+		bool wasDismissedByTappingOutside = true;
+
+		// Act
+		var result = new PopupResult(wasDismissedByTappingOutside);
+
+		// Assert
+		Assert.True(result.WasDismissedByTappingOutsideOfPopup);
+	}
+
+	[Fact]
+	public void PopupResultT_Constructor_SetsProperties()
+	{
+		// Arrange
+		var expectedResult = "Test Result";
+		bool wasDismissedByTappingOutside = true;
+
+		// Act
+		var result = new PopupResult<string>(expectedResult, wasDismissedByTappingOutside);
+
+		// Assert
+		Assert.True(result.WasDismissedByTappingOutsideOfPopup);
+		Assert.Equal(expectedResult, result.Result);
+	}
+
+	[Fact]
+	public void PopupResultT_Constructor_AllowsNullResult()
+	{
+		// Arrange
+		string? expectedResult = null;
+		bool wasDismissedByTappingOutside = true;
+
+		// Act
+		var result = new PopupResult<string?>(expectedResult, wasDismissedByTappingOutside);
+
+		// Assert
+		Assert.True(result.WasDismissedByTappingOutsideOfPopup);
+		Assert.Null(result.Result);
+	}
+
+	[Fact]
+	public void PopupResultT_Constructor_AllowsValueTypeResult()
+	{
+		// Arrange
+		int expectedResult = 42;
+		bool wasDismissedByTappingOutside = false;
+
+		// Act
+		var result = new PopupResult<int>(expectedResult, wasDismissedByTappingOutside);
+
+		// Assert
+		Assert.False(result.WasDismissedByTappingOutsideOfPopup);
+		Assert.Equal(expectedResult, result.Result);
+	}
+
+	[Fact]
+	public void PopupResultT_Constructor_AllowsNullableValueTypeResult()
+	{
+		// Arrange
+		int? expectedResult = null;
+		bool wasDismissedByTappingOutside = true;
+
+		// Act
+		var result = new PopupResult<int?>(expectedResult, wasDismissedByTappingOutside);
+
+		// Assert
+		Assert.True(result.WasDismissedByTappingOutsideOfPopup);
+		Assert.Null(result.Result);
+	}
+
+	[Fact]
+	public void PopupResultT_Constructor_AllowsReferenceTypeResult()
+	{
+		// Arrange
+		var expectedResult = new object();
+		bool wasDismissedByTappingOutside = false;
+
+		// Act
+		var result = new PopupResult<object>(expectedResult, wasDismissedByTappingOutside);
+
+		// Assert
+		Assert.False(result.WasDismissedByTappingOutsideOfPopup);
+		Assert.Equal(expectedResult, result.Result);
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.UnitTests/Views/Popup/PopupTests.cs b/src/CommunityToolkit.Maui.UnitTests/Views/Popup/PopupTests.cs
index 9550d4e6e8..efdb093b58 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Views/Popup/PopupTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Views/Popup/PopupTests.cs
@@ -1,413 +1,162 @@
-using System.ComponentModel;
-using CommunityToolkit.Maui.Core;
-using CommunityToolkit.Maui.UnitTests.Mocks;
-using CommunityToolkit.Maui.Views;
+using CommunityToolkit.Maui.Views;
 using FluentAssertions;
 using Xunit;
 
 namespace CommunityToolkit.Maui.UnitTests.Views;
 
-public class PopupTests : BaseHandlerTest
+public class PopupTests : BaseTest
 {
-	const string resultWhenUserTapsOutsideOfPopup = "User Tapped Outside of Popup";
-	readonly MockPopup popup = new();
-	readonly MockPopupHandler popupHandler;
-
-	public PopupTests()
+	[Fact]
+	public void PopupBackgroundColor_DefaultValue_ShouldBeWhite()
 	{
-		popupHandler = CreateElementHandler<MockPopupHandler>(popup);
-		Assert.IsType<IPopup>(new MockPopup(), exactMatch: false);
+		Assert.Equal(PopupDefaults.BackgroundColor, Colors.White);
 	}
-
+	
 	[Fact]
-	public void GetRequiredServiceThrowsOnNoContext()
+	public void Margin_DefaultValue_ShouldBeDefaultThickness()
 	{
-		var handlerStub = new MockPopupHandler();
-
-		(handlerStub as IElementHandler).MauiContext.Should().BeNull();
-
-		var ex = Assert.Throws<InvalidOperationException>(() => handlerStub.GetRequiredService<IFooService>());
-
-		Assert.Contains("the context", ex.Message);
-		Assert.Contains("MauiContext", ex.Message);
+		var popup = new Popup();
+		Assert.Equal(PopupDefaults.Margin, popup.Margin);
 	}
 
-	[Fact(Timeout = (int)TestDuration.Short)]
-	public async Task ShowPopupAsync_CancellationTokenExpired()
+	[Fact]
+	public void Margin_SetValue_ShouldBeUpdated()
 	{
-		var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(1));
-
-		var app = Application.Current ?? throw new NullReferenceException();
-
-		var page = new ContentPage
-		{
-			Content = new Label
-			{
-				Text = "Hello there"
-			}
-		};
-
-		// Make sure that our page will have a Handler
-		CreateViewHandler<MockPageHandler>(page);
-
-		var window = new Window
-		{
-			Page = page
-		};
-		app.AddWindow(window);
-
-		Assert.NotNull(popup.Handler);
-		Assert.NotNull(page.Handler);
-
-		// Ensure CancellationToken Has Expired
-		await Task.Delay(100, TestContext.Current.CancellationToken);
-
-		await Assert.ThrowsAnyAsync<OperationCanceledException>(() => page.ShowPopupAsync(popup, cts.Token));
-		app.RemoveWindow(window);
+		var popup = new Popup();
+		var thickness = new Thickness(10);
+		popup.Margin = thickness;
+		Assert.Equal(thickness, popup.Margin);
 	}
 
-	[Fact(Timeout = (int)TestDuration.Short)]
-	public async Task ShowPopupAsync_CancellationTokenCancelled()
+	[Fact]
+	public void Padding_DefaultValue_ShouldBeDefaultThickness()
 	{
-		var cts = new CancellationTokenSource();
-
-		var page = new ContentPage
-		{
-			Content = new Label
-			{
-				Text = "Hello there"
-			}
-		};
-
-		// Make sure that our page will have a Handler
-		CreateViewHandler<MockPageHandler>(page);
-
-		var window = new Window
-		{
-			Page = page
-		};
-		Application.Current?.AddWindow(window);
-
-		Assert.NotNull(popup.Handler);
-		Assert.NotNull(page.Handler);
-
-		// Ensure CancellationToken Has Expired
-		await cts.CancelAsync();
-
-		await Assert.ThrowsAnyAsync<OperationCanceledException>(() => page.ShowPopupAsync(popup, cts.Token));
-		Application.Current?.RemoveWindow(window);
+		var popup = new Popup();
+		Assert.Equal(PopupDefaults.Padding, popup.Padding);
 	}
 
-	[Fact(Timeout = (int)TestDuration.Short)]
-	public async Task CloseAsync_CancellationTokenExpired()
+	[Fact]
+	public void Padding_SetValue_ShouldBeUpdated()
 	{
-		var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(1));
-
-		var app = Application.Current ?? throw new NullReferenceException();
-
-		var page = new ContentPage
-		{
-			Content = new Label
-			{
-				Text = "Hello there"
-			}
-		};
-
-		// Make sure that our page will have a Handler
-		CreateViewHandler<MockPageHandler>(page);
-
-		var window = new Window
-		{
-			Page = page
-		};
-		app.AddWindow(window);
-
-		Assert.NotNull(popup.Handler);
-		Assert.NotNull(page.Handler);
-
-		// Ensure CancellationToken Has Expired
-		await Task.Delay(100, TestContext.Current.CancellationToken);
-
-		await Assert.ThrowsAnyAsync<OperationCanceledException>(() => popup.CloseAsync(token: cts.Token));
-		app.RemoveWindow(window);
+		var popup = new Popup();
+		var thickness = new Thickness(10);
+		popup.Padding = thickness;
+		Assert.Equal(thickness, popup.Padding);
 	}
 
-	[Fact(Timeout = (int)TestDuration.Short)]
-	public async Task CloseAsync_CancellationTokenCancelled()
+	[Fact]
+	public void VerticalOptions_DefaultValue_ShouldBeDefaultLayoutOptions()
 	{
-		var cts = new CancellationTokenSource();
-
-		var app = Application.Current ?? throw new NullReferenceException();
-
-		var page = new ContentPage
-		{
-			Content = new Label
-			{
-				Text = "Hello there"
-			}
-		};
-
-		// Make sure that our page will have a Handler
-		CreateViewHandler<MockPageHandler>(page);
-
-		var window = new Window
-		{
-			Page = page
-		};
-		app.AddWindow(window);
-
-		Assert.NotNull(popup.Handler);
-		Assert.NotNull(page.Handler);
-
-		// Ensure CancellationToken Has Expired
-		await cts.CancelAsync();
-
-		await Assert.ThrowsAnyAsync<OperationCanceledException>(() => popup.CloseAsync(token: cts.Token));
-		app.RemoveWindow(window);
+		var popup = new Popup();
+		Assert.Equal(PopupDefaults.VerticalOptions, popup.VerticalOptions);
 	}
 
-	[Fact(Timeout = (int)TestDuration.Short)]
-	public async Task OnOpenedMapperIsCalled()
+	[Fact]
+	public void VerticalOptions_SetValue_ShouldBeUpdated()
 	{
-		var app = Application.Current ?? throw new NullReferenceException();
-
-		var page = new ContentPage
-		{
-			Content = new Label
-			{
-				Text = "Hello there"
-			}
-		};
-
-		// Make sure that our page will have a Handler
-		CreateViewHandler<MockPageHandler>(page);
-
-		var window = new Window
-		{
-			Page = page
-		};
-		app.AddWindow(window);
-
-		Assert.NotNull(popup.Handler);
-		Assert.NotNull(page.Handler);
-
-		page.ShowPopup(popup);
-		Assert.Equal(1, popupHandler.OnOpenedCount);
-		await popup.OnDismissedByTappingOutsideOfPopup(TestContext.Current.CancellationToken);
-
-		var popupTask = page.ShowPopupAsync(popup, TestContext.Current.CancellationToken);
-		await popup.OnDismissedByTappingOutsideOfPopup(TestContext.Current.CancellationToken);
-
-		await popupTask;
-
-		Assert.Equal(2, popupHandler.OnOpenedCount);
-		app.RemoveWindow(window);
+		var popup = new Popup();
+		var layoutOptions = LayoutOptions.Center;
+		popup.VerticalOptions = layoutOptions;
+		Assert.Equal(layoutOptions, popup.VerticalOptions);
 	}
 
-	[Fact(Timeout = (int)TestDuration.Medium)]
-	public async Task PopupDismissedByTappingOutsideOfPopup()
+	[Fact]
+	public void HorizontalOptions_DefaultValue_ShouldBeDefaultLayoutOptions()
 	{
-		var popupClosedTCS = new TaskCompletionSource<(string? Result, bool WasDismissedByTappingOutsideOfPopup)>();
-		var app = Application.Current ?? throw new NullReferenceException();
-
-		var page = new ContentPage
-		{
-			Content = new Label
-			{
-				Text = "Hello there"
-			}
-		};
-
-		popup.Closed += (s, e) =>
-		{
-			Assert.Equal(popup, s);
-			popupClosedTCS.SetResult(((string?)e.Result, e.WasDismissedByTappingOutsideOfPopup));
-		};
-
-		// Make sure that our page will have a Handler
-		CreateViewHandler<MockPageHandler>(page);
-
-		var window = new Window
-		{
-			Page = page
-		};
-		app.AddWindow(window);
-
-		Assert.NotNull(popup.Handler);
-		Assert.NotNull(page.Handler);
-
-		await popup.OnDismissedByTappingOutsideOfPopup(TestContext.Current.CancellationToken);
-
-		var (result, wasDismissedByTappingOutsideOfPopup) = await popupClosedTCS.Task;
-
-		Assert.True(wasDismissedByTappingOutsideOfPopup);
-		Assert.Equal(resultWhenUserTapsOutsideOfPopup, result);
-		app.RemoveWindow(window);
+		var popup = new Popup();
+		Assert.Equal(PopupDefaults.HorizontalOptions, popup.HorizontalOptions);
 	}
 
-	[Fact(Timeout = (int)TestDuration.Short)]
-	public async Task OnDismissedWithResult()
+	[Fact]
+	public void HorizontalOptions_SetValue_ShouldBeUpdated()
 	{
-		object? result = null;
-		var isPopupDismissed = false;
-		var closedTCS = new TaskCompletionSource();
-		var app = Application.Current ?? throw new NullReferenceException();
-
-		var page = new ContentPage
-		{
-			Content = new Label
-			{
-				Text = "Hello there"
-			}
-		};
-
-		// Make sure that our page will have a Handler
-		CreateViewHandler<MockPageHandler>(page);
+		var popup = new Popup();
+		var layoutOptions = LayoutOptions.Center;
+		popup.HorizontalOptions = layoutOptions;
+		Assert.Equal(layoutOptions, popup.HorizontalOptions);
+	}
+	
+	[Fact]
+	public void NotifyPopupIsOpened_ShouldInvokeOpenedEvent()
+	{
+		// Arrange
+		var popup = new Popup();
+		var eventInvoked = false;
+		popup.Opened += (_, _) => eventInvoked = true;
 
-		var window = new Window
-		{
-			Page = page
-		};
-		app.AddWindow(window);
+		// Act
+		popup.NotifyPopupIsOpened();
 
-		Assert.NotNull(popup.Handler);
-		Assert.NotNull(page.Handler);
+		// Assert
+		eventInvoked.Should().BeTrue();
+	}
 
-		popup.Closed += (_, e) =>
-		{
-			result = e.Result;
-			isPopupDismissed = true;
-			closedTCS.SetResult();
-		};
+	[Fact]
+	public void NotifyPopupIsClosed_ShouldInvokeClosedEvent()
+	{
+		// Arrange
+		var popup = new Popup();
+		var eventInvoked = false;
+		popup.Closed += (_, _) => eventInvoked = true;
 
-		popup.Close(new object());
-		await closedTCS.Task;
+		// Act
+		popup.NotifyPopupIsClosed();
 
-		Assert.True(isPopupDismissed);
-		Assert.NotNull(result);
-		app.RemoveWindow(window);
+		// Assert
+		eventInvoked.Should().BeTrue();
 	}
 
-
 	[Fact(Timeout = (int)TestDuration.Short)]
-	public async Task OnDismissedWithoutResult()
+	public async Task Popup_Close_ShouldThrowExceptionWhenCalledBeforeShown()
 	{
-		object? result = null;
-		var isPopupDismissed = false;
-		var app = Application.Current ?? throw new NullReferenceException();
-
-		var page = new ContentPage
-		{
-			Content = new Label
-			{
-				Text = "Hello there"
-			}
-		};
-
-		// Make sure that our page will have a Handler
-		CreateViewHandler<MockPageHandler>(page);
-
-		var window = new Window
-		{
-			Page = page
-		};
-		app.AddWindow(window);
-
-		Assert.NotNull(popup.Handler);
-		Assert.NotNull(page.Handler);
-
-		popup.Closed += (_, e) =>
-		{
-			result = e.Result;
-			isPopupDismissed = true;
-		};
-
-		await popup.CloseAsync(token: TestContext.Current.CancellationToken);
+		// Arrange
+		var popup = new Popup();
 
-		Assert.True(isPopupDismissed);
-		Assert.Null(result);
-		app.RemoveWindow(window);
+		// Assert
+		await Assert.ThrowsAsync<PopupNotFoundException>(() => popup.Close(TestContext.Current.CancellationToken));
+		await Assert.ThrowsAnyAsync<InvalidOperationException>(() => popup.Close(TestContext.Current.CancellationToken));
 	}
 
-	[Fact]
-	public void NullColorThrowsArgumentNullException()
+	[Fact(Timeout = (int)TestDuration.Short)]
+	public async Task PopupT_Close_ShouldThrowExceptionWhenCalledBeforeShown()
 	{
-		var popupViewModel = new PopupViewModel();
-		var popupWithBinding = new Popup
-		{
-			BindingContext = popupViewModel
-		};
-		popupWithBinding.SetBinding(Popup.ColorProperty, nameof(PopupViewModel.Color));
+		// Arrange
+		var popup = new Popup<string>();
 
-#pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
-		Assert.Throws<ArgumentNullException>(() => new Popup { Color = null });
-		Assert.Throws<ArgumentNullException>(() => new Popup().Color = null);
-		Assert.Throws<ArgumentNullException>(() => popupViewModel.Color = null);
-#pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
+		// Assert
+		await Assert.ThrowsAsync<PopupNotFoundException>(() => popup.Close("Hello", TestContext.Current.CancellationToken));
+		await Assert.ThrowsAnyAsync<InvalidOperationException>(() => popup.Close("Hello", TestContext.Current.CancellationToken));
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
-	public async Task ShowPopup_IsLogicalChild()
+	public async Task Popup_Close_ShouldNotThrowExceptionWhenCloseIsOverridden()
 	{
-		var app = Application.Current ?? throw new NullReferenceException();
-
-		var page = new ContentPage
-		{
-			Content = new Label
-			{
-				Text = "Hello there"
-			}
-		};
-
-		// Make sure that our page will have a Handler
-		CreateViewHandler<MockPageHandler>(page);
-
-		var window = new Window
-		{
-			Page = page
-		};
-		app.AddWindow(window);
+		// Arrange
+		var popup = new PopupOverridingClose();
 
-		Assert.NotNull(popup.Handler);
-		Assert.NotNull(page.Handler);
-
-		Assert.Single(page.LogicalChildrenInternal);
-		page.ShowPopup(popup);
-		Assert.Equal(2, page.LogicalChildrenInternal.Count);
-
-		await popup.CloseAsync(token: TestContext.Current.CancellationToken);
-		Assert.Single(page.LogicalChildrenInternal);
-		app.RemoveWindow(window);
+		// Assert
+		await popup.Close(TestContext.Current.CancellationToken);
 	}
 
-	sealed class MockPopup : Popup
+	[Fact(Timeout = (int)TestDuration.Short)]
+	public async Task PopupT_Close_ShouldNotThrowExceptionWhenCloseIsOverridden()
 	{
-		public MockPopup()
-		{
-			ResultWhenUserTapsOutsideOfPopup = resultWhenUserTapsOutsideOfPopup;
-		}
+		// Arrange
+		var popup = new PopupTOverridingClose();
+
+		// Assert
+		await popup.Close(TestContext.Current.CancellationToken);
+		await popup.Close("Hello", TestContext.Current.CancellationToken);
 	}
 
-	sealed class PopupViewModel : INotifyPropertyChanged
+	sealed class PopupOverridingClose : Popup
 	{
-		public event PropertyChangedEventHandler? PropertyChanged;
-
-		public Color? Color
-		{
-			get;
-			set
-			{
-				if (!Equals(value, field))
-				{
-					field = value;
-					PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Color)));
-				}
-			}
-		} = new();
+		public override Task Close(CancellationToken token = default) => Task.CompletedTask;
 	}
 
-	interface IFooService
+	sealed class PopupTOverridingClose : Popup<string>
 	{
-		int MyProperty { get; set; }
+		public override Task Close(CancellationToken token = default) => Task.CompletedTask;
+		public override Task Close(string result, CancellationToken token = default) => Task.CompletedTask;
 	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.UnitTests/xunit.runner.json b/src/CommunityToolkit.Maui.UnitTests/xunit.runner.json
index f78bc2f0c6..48b5e1d228 100644
--- a/src/CommunityToolkit.Maui.UnitTests/xunit.runner.json
+++ b/src/CommunityToolkit.Maui.UnitTests/xunit.runner.json
@@ -1,3 +1,5 @@
 {
-  "$schema": "https://xunit.net/schema/current/xunit.runner.schema.json"
+  "$schema": "https://xunit.net/schema/current/xunit.runner.schema.json",
+  "parallelizeAssembly": false,
+  "parallelizeTestCollections": false
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui/AppBuilderExtensions.shared.cs b/src/CommunityToolkit.Maui/AppBuilderExtensions.shared.cs
index 6285403d90..1425fa1a99 100644
--- a/src/CommunityToolkit.Maui/AppBuilderExtensions.shared.cs
+++ b/src/CommunityToolkit.Maui/AppBuilderExtensions.shared.cs
@@ -2,6 +2,7 @@
 using CommunityToolkit.Maui.Core;
 using CommunityToolkit.Maui.Core.Handlers;
 using CommunityToolkit.Maui.PlatformConfiguration.AndroidSpecific;
+using CommunityToolkit.Maui.Services;
 using CommunityToolkit.Maui.Views;
 
 namespace CommunityToolkit.Maui;
@@ -36,12 +37,9 @@ public static MauiAppBuilder UseMauiCommunityToolkit(this MauiAppBuilder builder
 		builder.ConfigureMauiHandlers(static h =>
 		{
 			h.AddHandler<DrawingView, DrawingViewHandler>();
-			h.AddHandler<Popup, PopupHandler>();
 			h.AddHandler<SemanticOrderView, SemanticOrderViewHandler>();
 		});
 
-		Popup.RemapForControls();
-
 #if ANDROID
 		NavigationBar.RemapForControls();
 #endif
diff --git a/src/CommunityToolkit.Maui/CommunityToolkit.Maui.csproj b/src/CommunityToolkit.Maui/CommunityToolkit.Maui.csproj
index c5e09dab36..3b43020049 100644
--- a/src/CommunityToolkit.Maui/CommunityToolkit.Maui.csproj
+++ b/src/CommunityToolkit.Maui/CommunityToolkit.Maui.csproj
@@ -69,7 +69,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Maui.Controls" Version="[$(MauiPackageVersion),$(NextMauiPackageVersion))"/>
+    <PackageReference Include="Microsoft.Maui.Controls" Version="[$(MauiPackageVersion),$(NextMauiPackageVersion))" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" Condition=" '$(Configuration)'=='Release' " PrivateAssets="All" />
   </ItemGroup>
 
diff --git a/src/CommunityToolkit.Maui/Extensions/PopupExtensions.shared.cs b/src/CommunityToolkit.Maui/Extensions/PopupExtensions.shared.cs
new file mode 100644
index 0000000000..40f9995f9a
--- /dev/null
+++ b/src/CommunityToolkit.Maui/Extensions/PopupExtensions.shared.cs
@@ -0,0 +1,121 @@
+using CommunityToolkit.Maui.Core;
+using CommunityToolkit.Maui.Views;
+
+namespace CommunityToolkit.Maui.Extensions;
+
+/// <summary>
+/// Popup extensions.
+/// </summary>
+public static class PopupExtensions
+{
+	/// <summary>
+	/// Shows a popup with the specified options.
+	/// </summary>
+	/// <param name="page">Current page</param>
+	/// <param name="view">Popup content</param>
+	/// <param name="options"><see cref="IPopupOptions"/></param>
+	/// <remarks>This is an <see langword="async"/> <see langword="void"/> method. Use <see cref="ShowPopupAsync(Page,View,CommunityToolkit.Maui.IPopupOptions?,CancellationToken)"/> to <see langword="await"/> this method and return <see cref="PopupResult{T}"/> </remarks>
+	public static void ShowPopup(this Page page, View view, IPopupOptions? options = null)
+	{
+		ArgumentNullException.ThrowIfNull(page);
+
+		ShowPopup(page.Navigation, view, options);
+	}
+
+	/// <summary>
+	/// Shows a popup with the specified options.
+	/// </summary>
+	/// <param name="navigation">Popup parent</param>
+	/// <param name="view">Popup content</param>
+	/// <param name="options"><see cref="IPopupOptions"/></param>
+	/// <remarks>This is an <see langword="async"/> <see langword="void"/> method. Use <see cref="ShowPopupAsync(Page,View,CommunityToolkit.Maui.IPopupOptions?,CancellationToken)"/> to <see langword="await"/> this method</remarks>
+	public static async void ShowPopup(this INavigation navigation, View view, IPopupOptions? options = null)
+	{
+		ArgumentNullException.ThrowIfNull(navigation);
+		ArgumentNullException.ThrowIfNull(view);
+
+		var popupPage = new PopupPage(view, options ?? PopupOptions.Empty);
+
+		await navigation.PushModalAsync(popupPage, false);
+	}
+
+	/// <summary>
+	/// Opens a popup with the specified options.
+	/// </summary>
+	/// <param name="page">Current page</param>
+	/// <param name="view">Popup content</param>
+	/// <param name="options"><see cref="IPopupOptions"/></param>
+	/// <param name="token"><see cref="CancellationToken"/></param>
+	/// <returns><see cref="IPopupResult"/></returns>
+	public static Task<IPopupResult<TResult>> ShowPopupAsync<TResult>(this Page page, View view, IPopupOptions? options = null, CancellationToken token = default)
+	{
+		ArgumentNullException.ThrowIfNull(page);
+
+		return page.Navigation.ShowPopupAsync<TResult>(view, options, token);
+	}
+
+	/// <summary>
+	/// Opens a popup with the specified options.
+	/// </summary>
+	/// <param name="navigation">Popup parent</param>
+	/// <param name="view">Popup content</param>
+	/// <param name="options"><see cref="IPopupOptions"/></param>
+	/// <param name="token"><see cref="CancellationToken"/></param>
+	/// <returns><see cref="IPopupResult{T}"/></returns>
+	public static async Task<IPopupResult<TResult>> ShowPopupAsync<TResult>(this INavigation navigation, View view, IPopupOptions? options = null, CancellationToken token = default)
+	{
+		var result = await ShowPopupAsync(navigation, view, options, token);
+
+		return result switch
+		{
+			PopupResult<TResult> popupResult => popupResult,
+			IPopupResult => new PopupResult<TResult>(null, result.WasDismissedByTappingOutsideOfPopup),
+			_ => throw new NotSupportedException($"PopupResult type {typeof(TResult)} is not supported")
+		};
+	}
+
+	/// <summary>
+	/// Shows a popup with the specified options.
+	/// </summary>
+	/// <param name="page">Current page</param>
+	/// <param name="view">Popup content</param>
+	/// <param name="options"><see cref="IPopupOptions"/></param>
+	/// <param name="token"><see cref="CancellationToken"/></param>
+	/// <returns><see cref="IPopupResult"/></returns>
+	public static Task<IPopupResult> ShowPopupAsync(this Page page, View view, IPopupOptions? options = null, CancellationToken token = default)
+	{
+		ArgumentNullException.ThrowIfNull(page);
+
+		return ShowPopupAsync(page.Navigation, view, options, token);
+	}
+
+	/// <summary>
+	/// Shows a popup with the specified options.
+	/// </summary>
+	/// <param name="navigation">Popup parent</param>
+	/// <param name="view">Popup content</param>
+	/// <param name="options"><see cref="IPopupOptions"/></param>
+	/// <param name="token"><see cref="CancellationToken"/></param>
+	/// <returns><see cref="IPopupResult"/></returns>
+	public static async Task<IPopupResult> ShowPopupAsync(this INavigation navigation, View view, IPopupOptions? options, CancellationToken token = default)
+	{
+		ArgumentNullException.ThrowIfNull(navigation);
+		ArgumentNullException.ThrowIfNull(view);
+
+		token.ThrowIfCancellationRequested();
+
+		TaskCompletionSource<IPopupResult> taskCompletionSource = new(TaskCreationOptions.RunContinuationsAsynchronously);
+
+		var popupPage = new PopupPage(view, options ?? PopupOptions.Empty);
+		popupPage.PopupClosed += HandlePopupClosed;
+
+		await navigation.PushModalAsync(popupPage, false).WaitAsync(token);
+		return await taskCompletionSource.Task.WaitAsync(token);
+
+		void HandlePopupClosed(object? sender, IPopupResult e)
+		{
+			popupPage.PopupClosed -= HandlePopupClosed;
+			taskCompletionSource.SetResult(e);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui/Extensions/ServiceCollectionExtensions.shared.cs b/src/CommunityToolkit.Maui/Extensions/ServiceCollectionExtensions.shared.cs
index b1a3369bc6..8f1bca0795 100644
--- a/src/CommunityToolkit.Maui/Extensions/ServiceCollectionExtensions.shared.cs
+++ b/src/CommunityToolkit.Maui/Extensions/ServiceCollectionExtensions.shared.cs
@@ -1,5 +1,6 @@
 using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
+using CommunityToolkit.Maui.Services;
 using CommunityToolkit.Maui.Views;
 
 // Using root CommunityToolkit.Maui namespace so these extension methods
@@ -13,45 +14,129 @@ namespace CommunityToolkit.Maui;
 public static class ServiceCollectionExtensions
 {
 	/// <summary>
-	/// Adds a <see cref="BindableObject"/> of the type specified in <typeparamref name="TView"/> and a ViewModel
-	/// of the type specified in <typeparamref name="TViewModel"/> to the specified
+	/// Adds a <see cref="View"/> of the type specified in <typeparamref name="TPopupView"/>
 	/// <see cref="IServiceCollection"/> with <see cref="ServiceLifetime.Transient"/> lifetime.
 	/// </summary>
-	/// <typeparam name="TView">The type of the View to add. Constrained to <see cref="BindableObject"/></typeparam>
-	/// <typeparam name="TViewModel">The type of the ViewModel to add. Constrained to 
+	/// <typeparam name="TPopupView">The type of the Popup to add. Constrained to <see cref="IView"/></typeparam>
+	/// <param name="services">The <see cref="IServiceCollection"/> to add the service to.</param>
+	/// <returns>A reference to this instance after the operation has completed.</returns>
+	public static IServiceCollection AddTransientPopup<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TPopupView>(this IServiceCollection services)
+		where TPopupView : IView
+	{
+		PopupService.AddPopup<TPopupView>(services, ServiceLifetime.Transient);
+
+		return services;
+	}
+	
+	/// <summary>
+	/// Adds a <see cref="View"/> of the type specified in <typeparamref name="TPopupView"/> and a ViewModel
+	/// of the type specified in <typeparamref name="TPopupViewModel"/> to the specified
+	/// <see cref="IServiceCollection"/> with <see cref="ServiceLifetime.Transient"/> lifetime.
+	/// </summary>
+	/// <typeparam name="TPopupView">The type of the Popup to add. Constrained to <see cref="IView"/></typeparam>
+	/// <typeparam name="TPopupViewModel">The type of the ViewModel to add. Constrained to 
 	/// <see cref="INotifyPropertyChanged"/></typeparam>
 	/// <param name="services">The <see cref="IServiceCollection"/> to add the service to.</param>
 	/// <returns>A reference to this instance after the operation has completed.</returns>
-	/// <remarks>Developers are still responsible for assigning the injected instance of 
-	/// <typeparamref name="TViewModel" />
-	/// to the BindingContext property of <typeparamref name="TView" />.</remarks>
-	public static IServiceCollection AddTransient<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TView, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TViewModel>(this IServiceCollection services)
-		where TView : BindableObject
-		where TViewModel : class, INotifyPropertyChanged
+	public static IServiceCollection AddTransientPopup<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TPopupView, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TPopupViewModel>(this IServiceCollection services)
+		where TPopupView : IView
+		where TPopupViewModel : notnull
 	{
-		return services
-			.AddTransient<TViewModel>()
-			.AddTransient<TView>();
+		PopupService.AddPopup<TPopupView, TPopupViewModel>(services, ServiceLifetime.Transient);
+
+		return services;
 	}
+	
+	/// <summary>
+	/// Adds a <see cref="View"/> of the type specified in <typeparamref name="TPopupView"/> and a ViewModel
+	/// <see cref="IServiceCollection"/> with <see cref="ServiceLifetime.Transient"/> lifetime.
+	/// </summary>
+	/// <typeparam name="TPopupView">The type of the Popup to add. Constrained to <see cref="IView"/></typeparam>
+	/// <param name="services">The <see cref="IServiceCollection"/> to add the service to.</param>
+	/// <returns>A reference to this instance after the operation has completed.</returns>
+	public static IServiceCollection AddSingletonPopup<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TPopupView>(this IServiceCollection services)
+		where TPopupView : IView
+	{
+		PopupService.AddPopup<TPopupView>(services, ServiceLifetime.Singleton);
 
+		return services;
+	}
+	
 	/// <summary>
-	/// Adds a <see cref="Popup"/> of the type specified in <typeparamref name="TPopupView"/> and a ViewModel
+	/// Adds a <see cref="View"/> of the type specified in <typeparamref name="TPopupView"/> and a ViewModel
 	/// of the type specified in <typeparamref name="TPopupViewModel"/> to the specified
 	/// <see cref="IServiceCollection"/> with <see cref="ServiceLifetime.Transient"/> lifetime.
 	/// </summary>
-	/// <typeparam name="TPopupView">The type of the Popup to add. Constrained to <see cref="Popup"/></typeparam>
+	/// <typeparam name="TPopupView">The type of the Popup to add. Constrained to <see cref="IView"/></typeparam>
 	/// <typeparam name="TPopupViewModel">The type of the ViewModel to add. Constrained to 
 	/// <see cref="INotifyPropertyChanged"/></typeparam>
 	/// <param name="services">The <see cref="IServiceCollection"/> to add the service to.</param>
 	/// <returns>A reference to this instance after the operation has completed.</returns>
-	public static IServiceCollection AddTransientPopup<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TPopupView, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TPopupViewModel>(this IServiceCollection services)
-		where TPopupView : Popup
-		where TPopupViewModel : INotifyPropertyChanged
+	public static IServiceCollection AddSingletonPopup<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TPopupView, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TPopupViewModel>(this IServiceCollection services)
+		where TPopupView : IView
+		where TPopupViewModel : notnull
 	{
-		PopupService.AddTransientPopup<TPopupView, TPopupViewModel>(services);
+		PopupService.AddPopup<TPopupView, TPopupViewModel>(services, ServiceLifetime.Singleton);
 
 		return services;
 	}
+	
+		/// <summary>
+	/// Adds a <see cref="View"/> of the type specified in <typeparamref name="TPopupView"/> and a ViewModel
+	/// <see cref="IServiceCollection"/> with <see cref="ServiceLifetime.Transient"/> lifetime.
+	/// </summary>
+	/// <typeparam name="TPopupView">The type of the Popup to add. Constrained to <see cref="IView"/></typeparam>
+	/// <param name="services">The <see cref="IServiceCollection"/> to add the service to.</param>
+	/// <returns>A reference to this instance after the operation has completed.</returns>
+	public static IServiceCollection AddScopedPopup<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TPopupView>(this IServiceCollection services)
+		where TPopupView : IView
+	{
+		PopupService.AddPopup<TPopupView>(services, ServiceLifetime.Scoped);
+
+		return services;
+	}
+		
+	/// <summary>
+	/// Adds a <see cref="View"/> of the type specified in <typeparamref name="TPopupView"/> and a ViewModel
+	/// of the type specified in <typeparamref name="TPopupViewModel"/> to the specified
+	/// <see cref="IServiceCollection"/> with <see cref="ServiceLifetime.Transient"/> lifetime.
+	/// </summary>
+	/// <typeparam name="TPopupView">The type of the Popup to add. Constrained to <see cref="IView"/></typeparam>
+	/// <typeparam name="TPopupViewModel">The type of the ViewModel to add. Constrained to 
+	/// <see cref="INotifyPropertyChanged"/></typeparam>
+	/// <param name="services">The <see cref="IServiceCollection"/> to add the service to.</param>
+	/// <returns>A reference to this instance after the operation has completed.</returns>
+	public static IServiceCollection AddScopedPopup<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TPopupView, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TPopupViewModel>(this IServiceCollection services)
+		where TPopupView : IView
+		where TPopupViewModel : notnull
+	{
+		PopupService.AddPopup<TPopupView, TPopupViewModel>(services, ServiceLifetime.Scoped);
+
+		return services;
+	}
+	
+	
+	/// <summary>
+	/// Adds a <see cref="BindableObject"/> of the type specified in <typeparamref name="TView"/> and a ViewModel
+	/// of the type specified in <typeparamref name="TViewModel"/> to the specified
+	/// <see cref="IServiceCollection"/> with <see cref="ServiceLifetime.Transient"/> lifetime.
+	/// </summary>
+	/// <typeparam name="TView">The type of the View to add. Constrained to <see cref="BindableObject"/></typeparam>
+	/// <typeparam name="TViewModel">The type of the ViewModel to add. Constrained to 
+	/// <see cref="INotifyPropertyChanged"/></typeparam>
+	/// <param name="services">The <see cref="IServiceCollection"/> to add the service to.</param>
+	/// <returns>A reference to this instance after the operation has completed.</returns>
+	/// <remarks>Developers are still responsible for assigning the injected instance of 
+	/// <typeparamref name="TViewModel" />
+	/// to the BindingContext property of <typeparamref name="TView" />.</remarks>
+	public static IServiceCollection AddTransient<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TView, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TViewModel>(this IServiceCollection services)
+		where TView : BindableObject
+		where TViewModel : class, INotifyPropertyChanged
+	{
+		return services
+			.AddTransient<TViewModel>()
+			.AddTransient<TView>();
+	}
 
 	/// <summary>
 	/// Adds a <see cref="NavigableElement"/> of the type specified in <typeparamref name="TView"/> and a ViewModel
diff --git a/src/CommunityToolkit.Maui/Extensions/ValueConverterExtension.shared.cs b/src/CommunityToolkit.Maui/Extensions/ValueConverterExtension.shared.cs
index 3fffe9ac0c..3fbe55f9e2 100644
--- a/src/CommunityToolkit.Maui/Extensions/ValueConverterExtension.shared.cs
+++ b/src/CommunityToolkit.Maui/Extensions/ValueConverterExtension.shared.cs
@@ -1,16 +1,17 @@
 using System.Diagnostics.CodeAnalysis;
 using CommunityToolkit.Maui.Converters;
+using CommunityToolkit.Maui.Core.Extensions;
 
 namespace CommunityToolkit.Maui.Extensions;
 
-/// <inheritdoc />
+/// <inheritdoc cref="Microsoft.Maui.Controls.Xaml.IMarkupExtension" />
 public abstract class ValueConverterExtension : BindableObject, IMarkupExtension<ICommunityToolkitValueConverter>
 {
 	/// <inheritdoc />
 	public ICommunityToolkitValueConverter ProvideValue(IServiceProvider serviceProvider)
 		=> (ICommunityToolkitValueConverter)this;
 
-	private protected static bool IsNullable<T>() => IsNullable(typeof(T));
+	private protected static bool IsNullable<T>() => typeof(T).IsNullable();
 
 	private protected static bool IsValidTargetType<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods)] TTarget>([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] in Type targetType, bool shouldAllowNullableValueTypes)
 	{
@@ -44,7 +45,7 @@ public ICommunityToolkitValueConverter ProvideValue(IServiceProvider serviceProv
 
 		static bool IsValidNullableValueType(Type targetType)
 		{
-			if (!IsNullable(targetType))
+			if (!targetType.IsNullable())
 			{
 				return false;
 			}
@@ -87,21 +88,6 @@ null when IsNullable<TValue>() => default,
 	};
 #pragma warning restore CS8603 // Possible null reference return.
 
-	static bool IsNullable(Type type)
-	{
-		if (!type.IsValueType)
-		{
-			return true; // ref-type
-		}
-
-		if (Nullable.GetUnderlyingType(type) is not null)
-		{
-			return true; // Nullable<T>
-		}
-
-		return false; // value-type
-	}
-
 	object IMarkupExtension.ProvideValue(IServiceProvider serviceProvider)
 		=> ((IMarkupExtension<ICommunityToolkitValueConverter>)this).ProvideValue(serviceProvider);
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui/HandlerImplementation/Popup/Popup.macios.cs b/src/CommunityToolkit.Maui/HandlerImplementation/Popup/Popup.macios.cs
deleted file mode 100644
index 98875981bb..0000000000
--- a/src/CommunityToolkit.Maui/HandlerImplementation/Popup/Popup.macios.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using System.Diagnostics;
-using CommunityToolkit.Maui.Core;
-using CommunityToolkit.Maui.Core.Handlers;
-using Microsoft.Maui.Handlers;
-using Microsoft.Maui.Platform;
-
-namespace CommunityToolkit.Maui.Views;
-
-public partial class Popup
-{
-	/// <summary>
-	/// Action that's triggered when the Popup is Opened.
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-	/// <param name="result">We don't need to provide the result parameter here.</param>
-	public static void MapOnOpened(PopupHandler handler, IPopup view, object? result)
-	{
-		handler.PlatformView?.CreateControl(CreatePageHandler, view);
-		view.OnOpened();
-
-
-		static PageHandler CreatePageHandler(IPopup virtualView)
-		{
-			var mauiContext = virtualView.Handler?.MauiContext ?? throw new InvalidOperationException($"Unable to retrieve {nameof(IMauiContext)}");
-			var popupContent = (View)(virtualView.Content ?? throw new InvalidOperationException($"{nameof(IPopup.Content)} cannot be null."));
-
-			if (virtualView is BindableObject bindableObject)
-			{
-				popupContent.SetBinding(BindingContextProperty, BindingBase.Create<BindableObject, object>(static bindable => bindable.BindingContext, source: bindableObject));
-			}
-			else
-			{
-				Trace.TraceInformation($"Unable to set {nameof(BindableObject.BindingContext)} for {nameof(IPopup)}.{nameof(IPopup.Content)} because {nameof(IPopup)} implementation does not inherit from {nameof(BindableObject)}");
-			}
-
-			var contentPage = new ContentPage
-			{
-				Content = popupContent
-			};
-			var parent = virtualView.Parent as Element;
-			parent?.AddLogicalChild(contentPage);
-
-			return (PageHandler)contentPage.ToHandler(mauiContext);
-		}
-	}
-
-	/// <summary>
-	/// Action that's triggered when the Popup is Closed.
-	/// </summary>
-	/// <param name="handler">An instance of <see cref="PopupHandler"/>.</param>
-	/// <param name="view">An instance of <see cref="IPopup"/>.</param>
-	/// <param name="result">We don't need to provide the result parameter here.</param>
-	public static void MapOnClosed(PopupHandler handler, IPopup view, object? result)
-	{
-		PopupHandler.MapOnClosed(handler, view, result);
-
-		if (view.Parent is not Element parent || handler.VirtualView is not Popup popup)
-		{
-			return;
-		}
-
-		if (popup.Content?.Parent is ContentPage contentPage)
-		{
-			parent.RemoveLogicalChild(contentPage);
-		}
-
-		parent.RemoveLogicalChild(popup);
-	}
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui/HandlerImplementation/Popup/Popup.shared.cs b/src/CommunityToolkit.Maui/HandlerImplementation/Popup/Popup.shared.cs
deleted file mode 100644
index 8a8b027ea6..0000000000
--- a/src/CommunityToolkit.Maui/HandlerImplementation/Popup/Popup.shared.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using CommunityToolkit.Maui.Core;
-using CommunityToolkit.Maui.Core.Handlers;
-
-namespace CommunityToolkit.Maui.Views;
-
-public partial class Popup
-{
-	/// <summary>
-	/// Popup CommandMapper
-	/// </summary>
-	public static CommandMapper<IPopup, PopupHandler> ControlPopUpCommandMapper = new(PopupHandler.PopUpCommandMapper)
-	{
-#if IOS || MACCATALYST
-		[nameof(IPopup.OnOpened)] = MapOnOpened,
-		[nameof(IPopup.OnClosed)] = MapOnClosed
-#endif
-	};
-
-	internal static new void RemapForControls()
-	{
-		PopupHandler.PopUpCommandMapper = ControlPopUpCommandMapper;
-	}
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui/Interfaces/IPopupOptions.shared.cs b/src/CommunityToolkit.Maui/Interfaces/IPopupOptions.shared.cs
new file mode 100644
index 0000000000..4139ce86c8
--- /dev/null
+++ b/src/CommunityToolkit.Maui/Interfaces/IPopupOptions.shared.cs
@@ -0,0 +1,34 @@
+using Microsoft.Maui.Controls.Shapes;
+
+namespace CommunityToolkit.Maui;
+
+/// <summary>
+/// Interface defining the options used in <see cref="Views.Popup"/>.
+/// </summary>
+public interface IPopupOptions
+{
+	/// <summary>
+	/// Indicates whether the popup can be dismissed by tapping outside the Popup.
+	/// </summary>
+	bool CanBeDismissedByTappingOutsideOfPopup { get; }
+
+	/// <summary>
+	/// Color of the overlay behind the Popup
+	/// </summary>
+	Color PageOverlayColor { get; }
+
+	/// <summary>
+	/// Action to be executed when the user taps outside the Popup.
+	/// </summary>
+	Action? OnTappingOutsideOfPopup { get; }
+
+	/// <summary>
+	/// Popup border shape.
+	/// </summary>
+	Shape? Shape { get; }
+
+	/// <summary>
+	/// Popup Shadow
+	/// </summary>
+	Shadow? Shadow { get; }
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui/Interfaces/IPopupService.shared.cs b/src/CommunityToolkit.Maui/Interfaces/IPopupService.shared.cs
new file mode 100644
index 0000000000..d1febbd709
--- /dev/null
+++ b/src/CommunityToolkit.Maui/Interfaces/IPopupService.shared.cs
@@ -0,0 +1,56 @@
+using CommunityToolkit.Maui.Core;
+
+namespace CommunityToolkit.Maui;
+
+/// <summary>
+/// Provides a mechanism for displaying Popups based on the underlying view model.
+/// </summary>
+public interface IPopupService
+{
+	/// <summary>
+	/// Opens a popup with the specified options.
+	/// </summary>
+	/// <typeparam name="T">Supports both Popup Type or Popup ViewModel Type</typeparam>
+	/// <param name="navigation">The parent of the popup</param>
+	/// <param name="options"><see cref="IPopupOptions"/></param>
+	void ShowPopup<T>(INavigation navigation, IPopupOptions? options = null)
+		where T : notnull;
+
+	/// <summary>
+	/// Opens a popup with the specified options.
+	/// </summary>
+	/// <typeparam name="T">Supports both Popup Type or Popup ViewModel Type</typeparam>
+	/// <param name="navigation">The parent of the popup</param>
+	/// <param name="options"><see cref="IPopupOptions"/></param>
+	/// <param name="cancellationToken"><see cref="CancellationToken"/></param>
+	/// <returns><see cref="PopupResult"/></returns>
+	Task<IPopupResult> ShowPopupAsync<T>(INavigation navigation, IPopupOptions? options = null, CancellationToken cancellationToken = default)
+		where T : notnull;
+
+	/// <summary>
+	/// Opens a popup with the specified options.
+	/// </summary>
+	/// <typeparam name="T">Supports both Popup Type or Popup ViewModel Type</typeparam>
+	/// <typeparam name="TResult">Popup Result Type</typeparam>
+	/// <param name="navigation">The active <see cref="INavigation"/>, a property commonly found in <see cref="Microsoft.Maui.Controls.VisualElement"/></param>
+	/// <param name="options"><see cref="IPopupOptions"/></param>
+	/// <param name="cancellationToken"><see cref="CancellationToken"/></param>
+	/// <returns><see cref="PopupResult"/></returns>
+	Task<IPopupResult<TResult>> ShowPopupAsync<T, TResult>(INavigation navigation, IPopupOptions? options = null, CancellationToken cancellationToken = default)
+		where T : notnull;
+
+	/// <summary>
+	/// Closes the current popup.
+	/// </summary>
+	/// <param name="navigation">The active <see cref="INavigation"/>, a property commonly found in <see cref="Microsoft.Maui.Controls.VisualElement"/></param>
+	/// <param name="cancellationToken"><see cref="CancellationToken"/></param>
+	Task ClosePopupAsync(INavigation navigation, CancellationToken cancellationToken = default);
+
+	/// <summary>
+	/// Closes the current popup with a result.
+	/// </summary>
+	/// <param name="navigation">The active <see cref="INavigation"/>, a property commonly found in <see cref="Microsoft.Maui.Controls.VisualElement"/></param>
+	/// <param name="result">The result of a popup.</param>
+	/// <param name="cancellationToken"><see cref="CancellationToken"/></param>
+	Task ClosePopupAsync<T>(INavigation navigation, T result, CancellationToken cancellationToken = default);
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui/Popup/IPopupLifecycleController.cs b/src/CommunityToolkit.Maui/Popup/IPopupLifecycleController.cs
deleted file mode 100644
index 71a63724f9..0000000000
--- a/src/CommunityToolkit.Maui/Popup/IPopupLifecycleController.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using CommunityToolkit.Maui.Views;
-
-namespace CommunityToolkit.Maui;
-
-/// <summary>
-/// Defines the contract for a service that manages the presentation of popups.
-/// </summary>
-public interface IPopupLifecycleController
-{
-	/// <summary>
-	/// Gets the currently displayed popup.
-	/// </summary>
-	/// <returns>The currently displayed popup.</returns>
-	Popup? GetCurrentPopup();
-
-	/// <summary>
-	/// Called when a popup is shown.
-	/// </summary>
-	/// <param name="popup">The popup being shown.</param>
-	void OnShowPopup(Popup popup);
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui/Popup/PopupLifecycleController.cs b/src/CommunityToolkit.Maui/Popup/PopupLifecycleController.cs
deleted file mode 100644
index ff88d52717..0000000000
--- a/src/CommunityToolkit.Maui/Popup/PopupLifecycleController.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using CommunityToolkit.Maui.Core;
-using CommunityToolkit.Maui.Views;
-
-namespace CommunityToolkit.Maui;
-
-/// <summary>
-/// List-based implementation that manages the presentation of popups which will return the last item as the current popup.
-/// </summary>
-public class PopupLifecycleController : IPopupLifecycleController
-{
-	readonly List<WeakReference<Popup>> currentPopups = [];
-
-	/// <inheritdoc cref="IPopupLifecycleController.GetCurrentPopup"/>
-	public Popup? GetCurrentPopup()
-	{
-		var popupReference = currentPopups.LastOrDefault();
-
-		return popupReference?.TryGetTarget(out var popup) is true ? popup : null;
-	}
-
-	/// <inheritdoc cref="IPopupLifecycleController.OnShowPopup"/>
-	public void OnShowPopup(Popup popup)
-	{
-		popup.Closed += OnPopupClosed;
-		currentPopups.Add(new(popup));
-	}
-
-	void OnPopupClosed(object? sender, PopupClosedEventArgs e)
-	{
-		if (sender is not Popup popup)
-		{
-			return;
-		}
-
-		popup.Closed -= OnPopupClosed;
-		var matchingPopupReference = currentPopups.Find(reference => reference.TryGetTarget(out var target) && target == popup);
-
-		if (matchingPopupReference is not null)
-		{
-			currentPopups.Remove(matchingPopupReference);
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui/PopupService.cs b/src/CommunityToolkit.Maui/PopupService.cs
deleted file mode 100644
index 8ef5e45853..0000000000
--- a/src/CommunityToolkit.Maui/PopupService.cs
+++ /dev/null
@@ -1,231 +0,0 @@
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
-using CommunityToolkit.Maui.Core;
-using CommunityToolkit.Maui.Views;
-using Microsoft.Maui.Controls.Platform;
-
-namespace CommunityToolkit.Maui;
-
-/// <inheritdoc cref="IPopupService"/>
-public class PopupService : IPopupService
-{
-	static readonly Dictionary<Type, Type> viewModelToViewMappings = [];
-
-	readonly IServiceProvider serviceProvider;
-	readonly IDispatcher dispatcher;
-
-	/// <summary>
-	/// Creates a new instance of <see cref="PopupService"/>.
-	/// </summary>
-	/// <param name="serviceProvider">The <see cref="IServiceProvider"/> implementation.</param>
-	/// <param name="dispatcherProvider"></param>
-	[ActivatorUtilitiesConstructor]
-	public PopupService(IServiceProvider serviceProvider, IDispatcherProvider dispatcherProvider)
-	{
-		this.serviceProvider = serviceProvider;
-		dispatcher = dispatcherProvider.GetForCurrentThread()
-						?? throw new InvalidOperationException("Could not locate IDispatcher");
-	}
-
-	/// <summary>
-	/// Creates a new instance of <see cref="PopupService"/>.
-	/// </summary>
-	public PopupService()
-	{
-		serviceProvider = Application.Current?.Handler?.MauiContext?.Services
-			?? throw new InvalidOperationException("Could not locate IServiceProvider");
-
-		dispatcher = Application.Current.Dispatcher
-			?? throw new InvalidOperationException("Could not locate IDispatcher");
-	}
-
-	/// <summary>
-	/// Gets or sets the <see cref="IPopupLifecycleController"/> implementation.
-	/// </summary>
-	public IPopupLifecycleController PopupLifecycleController { get; set; } = new PopupLifecycleController();
-
-	static Page CurrentPage =>
-		PageExtensions.GetCurrentPage(
-			Application.Current?.Windows[0].Page ?? throw new InvalidOperationException("Application.Current?.Windows[0].Page cannot be null."));
-
-	internal static void ClearViewModelToViewMappings() => viewModelToViewMappings.Clear();
-
-	internal static void AddTransientPopup<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TPopupView, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TPopupViewModel>(IServiceCollection services)
-		where TPopupView : IPopup
-		where TPopupViewModel : INotifyPropertyChanged
-	{
-		viewModelToViewMappings.Add(typeof(TPopupViewModel), typeof(TPopupView));
-
-		services.AddTransient(typeof(TPopupView));
-		services.AddTransient(typeof(TPopupViewModel));
-	}
-
-	internal static void AddTransientPopup<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TPopupView, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TPopupViewModel>(TPopupView popup, TPopupViewModel popupViewModel, IServiceCollection services)
-		where TPopupView : class, IPopup
-		where TPopupViewModel : class, INotifyPropertyChanged
-	{
-		viewModelToViewMappings.Add(typeof(TPopupViewModel), typeof(TPopupView));
-
-		services.AddTransient<TPopupView>(_ => popup);
-		services.AddTransient<TPopupViewModel>(_ => popupViewModel);
-	}
-
-	/// <inheritdoc cref="IPopupService.ClosePopup(object?)" />
-	public void ClosePopup(object? result = null)
-	{
-		EnsureMainThreadIsUsed();
-
-		PopupLifecycleController.GetCurrentPopup()?.Close(result);
-	}
-
-	/// <inheritdoc cref="IPopupService.ClosePopupAsync(object?)" />
-	public Task ClosePopupAsync(object? result = null)
-	{
-		EnsureMainThreadIsUsed();
-
-		var popup = PopupLifecycleController.GetCurrentPopup();
-
-		return popup?.CloseAsync(result) ?? Task.CompletedTask;
-	}
-
-	/// <inheritdoc cref="IPopupService.ShowPopup{TViewModel}()"/>
-	public void ShowPopup<TViewModel>() where TViewModel : INotifyPropertyChanged
-	{
-		EnsureMainThreadIsUsed();
-
-		var popup = GetPopup(typeof(TViewModel));
-
-		ValidateBindingContext<TViewModel>(popup, out _);
-
-		InitializePopup(popup);
-
-		ShowPopup(popup);
-	}
-
-	/// <inheritdoc cref="IPopupService.ShowPopup{TViewModel}(Action{TViewModel})"/>
-	public void ShowPopup<TViewModel>(Action<TViewModel> onPresenting) where TViewModel : INotifyPropertyChanged
-	{
-		EnsureMainThreadIsUsed();
-
-		ArgumentNullException.ThrowIfNull(onPresenting);
-
-		var popup = GetPopup(typeof(TViewModel));
-
-		ValidateBindingContext(popup, out TViewModel viewModel);
-
-		onPresenting.Invoke(viewModel);
-
-		InitializePopup(popup);
-
-		ShowPopup(popup);
-	}
-
-	/// <inheritdoc cref="IPopupService.ShowPopupAsync{TViewModel}(CancellationToken)"/>
-	public Task<object?> ShowPopupAsync<TViewModel>(CancellationToken token = default) where TViewModel : INotifyPropertyChanged
-	{
-		EnsureMainThreadIsUsed();
-
-		var popup = GetPopup(typeof(TViewModel));
-
-		ValidateBindingContext<TViewModel>(popup, out _);
-
-		InitializePopup(popup);
-
-		return ShowPopupAsync(popup, token);
-	}
-
-	/// <inheritdoc cref="IPopupService.ShowPopupAsync{TViewModel}(Action{TViewModel}, CancellationToken)"/>
-	public Task<object?> ShowPopupAsync<TViewModel>(Action<TViewModel> onPresenting, CancellationToken token = default) where TViewModel : INotifyPropertyChanged
-	{
-		EnsureMainThreadIsUsed();
-
-		ArgumentNullException.ThrowIfNull(onPresenting);
-
-		var popup = GetPopup(typeof(TViewModel));
-
-		ValidateBindingContext(popup, out TViewModel viewModel);
-
-		onPresenting.Invoke(viewModel);
-
-		InitializePopup(popup);
-
-		return ShowPopupAsync(popup, token);
-	}
-
-	static Task<object?> ShowPopupAsync(Popup popup, CancellationToken token)
-	{
-#if WINDOWS
-		if (Application.Current is Application app)
-		{
-			if (app.Windows.FirstOrDefault(x => x.IsActivated) is Window activeWindow)
-			{
-				if (activeWindow.Page is Page page)
-				{
-					return page.ShowPopupAsync(popup, token);
-				}
-			}
-		}
-		return CurrentPage.ShowPopupAsync(popup, token);
-#else
-		return CurrentPage.ShowPopupAsync(popup, token);
-#endif
-	}
-
-	/// <summary>
-	/// Ensures that the BindingContext property of the Popup to present is properly assigned and of the expected type.
-	/// </summary>
-	/// <typeparam name="TViewModel"></typeparam>
-	/// <param name="popup">The popup to be presented.</param>
-	/// <param name="bindingContext">Validated View Model</param>
-	/// <exception cref="InvalidOperationException"></exception>
-	static void ValidateBindingContext<TViewModel>(Popup popup, out TViewModel bindingContext)
-	{
-		if (popup.BindingContext is not TViewModel viewModel)
-		{
-			throw new InvalidOperationException($"Unexpected type has been assigned to the BindingContext of {popup.GetType().FullName}. Expected type {typeof(TViewModel).FullName} but was {popup.BindingContext?.GetType().FullName ?? "null"}");
-		}
-
-		bindingContext = viewModel;
-	}
-
-	static void ShowPopup(Popup popup)
-	{
-#if WINDOWS
-		if (Application.Current is Application app)
-		{
-			if (app.Windows.FirstOrDefault(x => x.IsActivated) is Window activeWindow)
-			{
-				if (activeWindow.Page is Page page)
-				{
-					page.ShowPopup(popup);
-					return;
-				}
-			}
-		}
-		CurrentPage.ShowPopup(popup);
-#else
-		CurrentPage.ShowPopup(popup);
-#endif
-	}
-
-	void EnsureMainThreadIsUsed([CallerMemberName] string? callerName = default)
-	{
-		if (dispatcher.IsDispatchRequired)
-		{
-			throw new InvalidOperationException($"{callerName} must be called from the main thread.");
-		}
-	}
-
-	Popup GetPopup(Type viewModelType)
-	{
-		var popup = (Popup)(serviceProvider.GetService(viewModelToViewMappings[viewModelType])
-			?? throw new InvalidOperationException($"Unable to resolve popup type for {viewModelType} please make sure that you have called {nameof(PopupService)}.{nameof(AddTransientPopup)} in MauiProgram.cs"));
-		return popup;
-	}
-
-	void InitializePopup(Popup popup)
-	{
-		PopupLifecycleController.OnShowPopup(popup);
-	}
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui/Primitives/Defaults/PopupDefaults.shared.cs b/src/CommunityToolkit.Maui/Primitives/Defaults/PopupDefaults.shared.cs
new file mode 100644
index 0000000000..48eaed41e3
--- /dev/null
+++ b/src/CommunityToolkit.Maui/Primitives/Defaults/PopupDefaults.shared.cs
@@ -0,0 +1,34 @@
+using CommunityToolkit.Maui.Views;
+
+namespace CommunityToolkit.Maui;
+
+/// <summary>
+/// Default Values for <see cref="Microsoft.Maui.Controls.View"/>
+/// </summary>
+static class PopupDefaults
+{
+	/// <summary>
+	/// Default value for <see cref="Microsoft.Maui.Controls.View.Margin"/> 
+	/// </summary>
+	public static Thickness Margin { get; } = new(30);
+
+	/// <summary>
+	/// Default value for <see cref="Microsoft.Maui.Controls.Layout.Padding"/> 
+	/// </summary>
+	public static Thickness Padding { get; } = new(15);
+
+	/// <summary>
+	/// Default value for <see cref="Microsoft.Maui.Controls.View.VerticalOptions"/> 
+	/// </summary>
+	public static LayoutOptions VerticalOptions { get; } = LayoutOptions.Center;
+
+	/// <summary>
+	/// Default value for <see cref="Microsoft.Maui.Controls.View.HorizontalOptions"/> 
+	/// </summary>
+	public static LayoutOptions HorizontalOptions { get; } = LayoutOptions.Center;
+	
+	/// <summary>
+	/// Default value for <see cref="VisualElement.BackgroundColor"/> BackgroundColor 
+	/// </summary>
+	public static Color BackgroundColor { get; } = Colors.White;
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui/Primitives/Defaults/PopupOptionsDefaults.shared.cs b/src/CommunityToolkit.Maui/Primitives/Defaults/PopupOptionsDefaults.shared.cs
new file mode 100644
index 0000000000..2f3199d8f5
--- /dev/null
+++ b/src/CommunityToolkit.Maui/Primitives/Defaults/PopupOptionsDefaults.shared.cs
@@ -0,0 +1,57 @@
+using System.ComponentModel;
+using CommunityToolkit.Maui.Views;
+using Microsoft.Maui.Controls.Shapes;
+
+namespace CommunityToolkit.Maui;
+
+/// <summary>
+/// Default Values for <see cref="PopupOptions"/>
+/// </summary>
+static class PopupOptionsDefaults
+{
+	/// <summary>
+	/// Default value for <see cref="PopupOptions.Shape"/> <see cref="Shape.StrokeThickness"/>
+	/// </summary>
+	public const double BorderStrokeThickness = 2;
+
+	/// <summary>
+	/// Default value for <see cref="PopupOptions.CanBeDismissedByTappingOutsideOfPopup"/>
+	/// </summary>
+	public const bool CanBeDismissedByTappingOutsideOfPopup = true;
+
+	/// <summary>
+	/// Default value for <see cref="PopupOptions.OnTappingOutsideOfPopup"/> 
+	/// </summary>
+	public static Action? OnTappingOutsideOfPopup { get; } = null;
+
+	/// <summary>
+	/// Default value for <see cref="PopupOptions.PageOverlayColor"/> 
+	/// </summary>
+	public static Color PageOverlayColor { get; } = Colors.Black.WithAlpha(0.3f);
+
+	/// <summary>
+	/// Default value for <see cref="PopupOptions.Shape"/> <see cref="Shape.Stroke"/>
+	/// </summary>
+	public static Brush? BorderStroke { get; } = Colors.White;
+
+	/// <summary>
+	/// Default value for <see cref="PopupOptions.Shape"/> 
+	/// </summary>
+	public static IShape? Shape { get; } = new RoundRectangle
+	{
+		CornerRadius = new CornerRadius(20, 20, 20, 20),
+		StrokeThickness = BorderStrokeThickness,
+		Stroke = BorderStroke
+	};
+
+	/// <summary>
+	/// Default value for <see cref="PopupOptions.Shadow"/> 
+	/// </summary>
+	public static Shadow Shadow { get; } = new Shadow
+	{
+		Brush = Colors.Black,
+		Offset = new(20, 20),
+		Radius = 40,
+		Opacity = 0.8f
+	};
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui/Primitives/PopupResult.shared.cs b/src/CommunityToolkit.Maui/Primitives/PopupResult.shared.cs
new file mode 100644
index 0000000000..b0aa861eef
--- /dev/null
+++ b/src/CommunityToolkit.Maui/Primitives/PopupResult.shared.cs
@@ -0,0 +1,35 @@
+using CommunityToolkit.Maui.Core;
+using CommunityToolkit.Maui.Core.Extensions;
+
+namespace CommunityToolkit.Maui;
+
+/// <summary>
+/// Represents the result of a popup.
+/// </summary>
+/// <param name="WasDismissedByTappingOutsideOfPopup">True if Popup is closed by tapping outside popup</param>
+record PopupResult(bool WasDismissedByTappingOutsideOfPopup) : IPopupResult;
+
+/// <summary>
+/// Represents the result of a popup when T is a reference type.
+/// </summary>
+/// <typeparam name="T">Popup result type</typeparam>
+sealed record PopupResult<T> : PopupResult, IPopupResult<T>
+{
+	/// <summary>
+	/// Initialize <see cref="PopupResult{T}"/>.
+	/// </summary>
+	/// <param name="result">Popup result</param>
+	/// <param name="wasDismissedByTappingOutsideOfPopup">True if Popup is closed by tapping outside the popup</param>
+	public PopupResult(object? result, bool wasDismissedByTappingOutsideOfPopup) : base(wasDismissedByTappingOutsideOfPopup)
+	{
+		Result = typeof(T).IsNullable()
+			? (T?)result // Nullable types will be cast to `T`, e.g. bool?, object?
+			: (T?)(result ?? default(T)); // Non-Nullable types will only be cast to `T` when `result` is not null because .NET will throw an InvalidCastException when casting `null` to a value-type (e.g. bool, int). When result is null and T is a value-type, we will use the default type of T (e.g. default(int) == 0) and defer throwing the InvalidCastException until the developer retrieves the value of Result. 
+	}
+
+	public T? Result => WasDismissedByTappingOutsideOfPopup && !typeof(T).IsNullable()
+		? throw new PopupResultException($"{nameof(PopupResult)} type, {typeof(T)}, cannot be converted to null. When {nameof(WasDismissedByTappingOutsideOfPopup)} is {true}, {nameof(Result)} is always null. When using a non-nullable type, e.g. bool, be sure to first check if {nameof(WasDismissedByTappingOutsideOfPopup)} is {false} before getting the value of {nameof(Result)}")
+		: field;
+}
+
+sealed class PopupResultException(string message) : InvalidCastException(message);
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui/Services/PopupService.shared.cs b/src/CommunityToolkit.Maui/Services/PopupService.shared.cs
new file mode 100644
index 0000000000..3f34c607de
--- /dev/null
+++ b/src/CommunityToolkit.Maui/Services/PopupService.shared.cs
@@ -0,0 +1,134 @@
+using System.Diagnostics.CodeAnalysis;
+using CommunityToolkit.Maui.Core;
+using CommunityToolkit.Maui.Extensions;
+using CommunityToolkit.Maui.Views;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+
+namespace CommunityToolkit.Maui.Services;
+
+/// <inheritdoc cref="IPopupService"/>
+public class PopupService : IPopupService
+{
+	static readonly Dictionary<Type, Type> viewModelToViewMappings = [];
+
+	readonly IServiceProvider serviceProvider;
+
+	/// <summary>
+	/// Creates a new instance of <see cref="PopupService"/>.
+	/// </summary>
+	/// <param name="serviceProvider">The <see cref="IServiceProvider"/> implementation.</param>
+	[ActivatorUtilitiesConstructor]
+	public PopupService(IServiceProvider serviceProvider)
+	{
+		this.serviceProvider = serviceProvider;
+	}
+
+	/// <summary>
+	/// Creates a new instance of <see cref="PopupService"/>.
+	/// </summary>
+	public PopupService()
+	{
+		serviceProvider = IPlatformApplication.Current?.Services
+		                  ?? throw new InvalidOperationException("Could not locate IServiceProvider");
+	}
+
+	/// <inheritdoc />
+	/// <remarks>This is an <see langword="async"/> <see langword="void"/> method. Use <see cref="ShowPopupAsync{T}"/> to <see langword="await"/> this method</remarks>
+	public void ShowPopup<T>(INavigation navigation, IPopupOptions? options = null) where T : notnull
+	{
+		var popupContent = GetPopupContent(serviceProvider.GetRequiredService<T>());
+
+		navigation.ShowPopup(popupContent, options);
+	}
+
+	/// <inheritdoc />
+	public Task<IPopupResult> ShowPopupAsync<T>(INavigation navigation, IPopupOptions? options = null, CancellationToken token = default)
+		where T : notnull
+	{
+		token.ThrowIfCancellationRequested();
+
+		var popupContent = GetPopupContent(serviceProvider.GetRequiredService<T>());
+
+		return navigation.ShowPopupAsync(popupContent, options, token);
+	}
+
+	/// <inheritdoc />
+	public Task<IPopupResult<TResult>> ShowPopupAsync<T, TResult>(INavigation navigation,
+		IPopupOptions? options = null,
+		CancellationToken token = default)
+		where T : notnull
+	{
+		token.ThrowIfCancellationRequested();
+		var popupContent = GetPopupContent(serviceProvider.GetRequiredService<T>());
+
+		return navigation.ShowPopupAsync<TResult>(popupContent, options, token);
+	}
+
+	/// <inheritdoc />
+	public async Task ClosePopupAsync(INavigation navigation, CancellationToken cancellationToken = default)
+	{
+		cancellationToken.ThrowIfCancellationRequested();
+		var popupPage = GetCurrentPopupPage(navigation);
+
+		await popupPage.Close(new PopupResult(false), cancellationToken);
+	}
+
+	/// <inheritdoc />
+	public async Task ClosePopupAsync<T>(INavigation navigation, T result, CancellationToken cancellationToken = default)
+	{
+		cancellationToken.ThrowIfCancellationRequested();
+		var popupPage = GetCurrentPopupPage(navigation);
+
+		await popupPage.Close(new PopupResult<T>(result, false), cancellationToken);
+	}
+
+	internal static void AddPopup<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TPopupView>(
+		IServiceCollection services, ServiceLifetime lifetime)
+		where TPopupView : IView
+	{
+		viewModelToViewMappings.TryAdd(typeof(TPopupView), typeof(TPopupView));
+		services.Add(new ServiceDescriptor(typeof(TPopupView), typeof(TPopupView), lifetime));
+	}
+
+	internal static void AddPopup<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TPopupView, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TPopupViewModel>
+		(IServiceCollection services, ServiceLifetime lifetime)
+		where TPopupView : IView
+		where TPopupViewModel : notnull
+	{
+		viewModelToViewMappings.TryAdd(typeof(TPopupViewModel), typeof(TPopupView));
+		
+		services.TryAdd(new ServiceDescriptor(typeof(TPopupView), typeof(TPopupView), lifetime));
+		services.TryAdd(new ServiceDescriptor(typeof(TPopupViewModel), typeof(TPopupViewModel), lifetime));
+	}
+
+	internal static void AddPopup<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TPopupView, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TPopupViewModel>
+		(TPopupView popup, TPopupViewModel viewModel, IServiceCollection services, ServiceLifetime lifetime)
+		where TPopupView : IView
+		where TPopupViewModel : notnull
+	{
+		viewModelToViewMappings.TryAdd(typeof(TPopupViewModel), typeof(TPopupView));
+
+		services.TryAdd(new ServiceDescriptor(typeof(TPopupView), _ => popup, lifetime));
+		services.TryAdd(new ServiceDescriptor(typeof(TPopupViewModel), _ => viewModel, lifetime));
+	}
+
+	// All popups are now displayed in a PopupPage (ContentPage) that is pushed modally to the screen, e.g. Navigation.PushModalAsync(popupPage)
+	// We can use the ModalStack to retrieve the most recent popupPage by retrieving all PopupPages and return the most recent from the ModalStack  
+	static PopupPage GetCurrentPopupPage(INavigation navigation) =>
+		navigation.ModalStack.OfType<PopupPage>().LastOrDefault() ?? throw new PopupNotFoundException();
+
+	View GetPopupContent<T>(T bindingContext)
+	{
+		if (bindingContext is View view)
+		{
+			return view;
+		}
+
+		if (serviceProvider.GetRequiredService(viewModelToViewMappings[typeof(T)]) is View content)
+		{
+			return content;
+		}
+
+		throw new InvalidOperationException($"Could not locate {typeof(T).FullName}");
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui/Views/Popup/Popup.shared.cs b/src/CommunityToolkit.Maui/Views/Popup/Popup.shared.cs
index 2099c179ed..894ace2b01 100644
--- a/src/CommunityToolkit.Maui/Views/Popup/Popup.shared.cs
+++ b/src/CommunityToolkit.Maui/Views/Popup/Popup.shared.cs
@@ -1,415 +1,134 @@
-using CommunityToolkit.Maui.Core;
-using Microsoft.Maui.Controls.Internals;
-using Microsoft.Maui.Controls.StyleSheets;
-using LayoutAlignment = Microsoft.Maui.Primitives.LayoutAlignment;
-using Style = Microsoft.Maui.Controls.Style;
+using CommunityToolkit.Maui.Extensions;
 
 namespace CommunityToolkit.Maui.Views;
 
 /// <summary>
-/// Represents a small View that pops up at front the Page. Implements <see cref="IPopup"/>.
+/// Represents a small View that pops up at front the Page.
 /// </summary>
-[ContentProperty(nameof(Content))]
-public partial class Popup : Element, IPopup, IWindowController, IPropertyPropagationController, IResourcesProvider, IStyleSelectable, IStyleElement
+public partial class Popup : ContentView
 {
 	/// <summary>
-	///  Backing BindableProperty for the <see cref="Content"/> property.
+	/// Bindable property to set the margin between the <see cref="Popup"/> and the edge of the window
 	/// </summary>
-	public static readonly BindableProperty ContentProperty = BindableProperty.Create(nameof(Content), typeof(View), typeof(Popup), propertyChanged: OnContentChanged);
+	public static new readonly BindableProperty MarginProperty = View.MarginProperty;
 
 	/// <summary>
-	///  Backing BindableProperty for the <see cref="Color"/> property.
+	/// Bindable property to set the padding between the <see cref="Popup"/> border and the <see cref="Popup"/> content
 	/// </summary>
-	public static readonly BindableProperty ColorProperty = BindableProperty.Create(nameof(Color), typeof(Color), typeof(Popup), Colors.LightGray, propertyChanged: OnColorChanged);
+	public static new readonly BindableProperty PaddingProperty = ContentView.PaddingProperty;
 
 	/// <summary>
-	///  Backing BindableProperty for the <see cref="Size"/> property.
+	/// Bindable property to set the horizontal position of the <see cref="Popup"/> when displayed on screen
 	/// </summary>
-	public static readonly BindableProperty SizeProperty = BindableProperty.Create(nameof(Size), typeof(Size), typeof(Popup), default(Size));
+	public static new readonly BindableProperty HorizontalOptionsProperty = View.HorizontalOptionsProperty;
 
 	/// <summary>
-	///  Backing BindableProperty for the <see cref="CanBeDismissedByTappingOutsideOfPopup"/> property.
+	/// Bindable property to set the vertical position of the <see cref="Popup"/> when displayed on screen
 	/// </summary>
-	public static readonly BindableProperty CanBeDismissedByTappingOutsideOfPopupProperty = BindableProperty.Create(nameof(CanBeDismissedByTappingOutsideOfPopup), typeof(bool), typeof(Popup), true);
+	public static new readonly BindableProperty VerticalOptionsProperty = View.VerticalOptionsProperty;
 
 	/// <summary>
-	///  Backing BindableProperty for the <see cref="VerticalOptions"/> property.
-	/// </summary>
-	public static readonly BindableProperty VerticalOptionsProperty = BindableProperty.Create(nameof(VerticalOptions), typeof(LayoutAlignment), typeof(Popup), LayoutAlignment.Center);
-
-	/// <summary>
-	///  Backing BindableProperty for the <see cref="HorizontalOptions"/> property.
-	/// </summary>
-	public static readonly BindableProperty HorizontalOptionsProperty = BindableProperty.Create(nameof(HorizontalOptions), typeof(LayoutAlignment), typeof(Popup), LayoutAlignment.Center);
-
-	/// <summary>
-	///  Backing BindableProperty for the <see cref="Style" /> property. 
-	/// </summary>
-	public static readonly BindableProperty StyleProperty = BindableProperty.Create(nameof(Style), typeof(Style), typeof(Popup), default(Style), propertyChanged: (bindable, oldValue, newValue) => ((Popup)bindable).mergedStyle.Style = (Style)newValue);
-
-	readonly WeakEventManager dismissWeakEventManager = new();
-	readonly WeakEventManager openedWeakEventManager = new();
-	readonly MergedStyle mergedStyle;
-
-	TaskCompletionSource popupDismissedTaskCompletionSource = new();
-	TaskCompletionSource<object?> resultTaskCompletionSource = new();
-	ResourceDictionary resources = [];
-
-	/// <summary>
-	/// Instantiates a new instance of <see cref="Popup"/>.
+	/// Initializes Popup
 	/// </summary>
 	public Popup()
 	{
-		((IResourceDictionary)resources).ValuesChanged += OnResourcesChanged;
-
-		VerticalOptions = HorizontalOptions = LayoutAlignment.Center;
-		mergedStyle = new MergedStyle(GetType(), this);
-	}
-
-	/// <summary>
-	/// Dismissed event is invoked when the popup is closed.
-	/// </summary>
-	public event EventHandler<PopupClosedEventArgs> Closed
-	{
-		add => dismissWeakEventManager.AddEventHandler(value);
-		remove => dismissWeakEventManager.RemoveEventHandler(value);
+		Margin = PopupDefaults.Margin;
+		Padding = PopupDefaults.Padding;
+		HorizontalOptions = PopupDefaults.HorizontalOptions;
+		VerticalOptions = PopupDefaults.VerticalOptions;
 	}
 
 	/// <summary>
-	/// Opened event is invoked when the popup is opened.
+	/// Event occurs when <see cref="Popup"/> is opened.
 	/// </summary>
-	public event EventHandler<PopupOpenedEventArgs> Opened
-	{
-		add => openedWeakEventManager.AddEventHandler(value);
-		remove => openedWeakEventManager.RemoveEventHandler(value);
-	}
+	public event EventHandler? Opened;
 
 	/// <summary>
-	/// Gets the final result of the dismissed popup.
+	/// Event occurs when <see cref="Popup"/> is closed.
 	/// </summary>
-	public Task<object?> Result => resultTaskCompletionSource.Task;
+	public event EventHandler? Closed;
 
 	/// <summary>
-	/// Gets or sets the <see cref="View"/> content to render in the Popup.
+	/// Sets the margin between the <see cref="Popup"/> and the edge of the window
 	/// </summary>
-	/// <remarks>
-	/// The View can be or type: <see cref="View"/>, <see cref="ContentPage"/> or <see cref="NavigationPage"/>
-	/// </remarks>
-	public virtual View? Content
+	public new Thickness Margin
 	{
-		get => (View?)GetValue(ContentProperty);
-		set => SetValue(ContentProperty, value);
+		get => base.Margin;
+		set => base.Margin = value;
 	}
 
 	/// <summary>
-	/// Gets or sets the <see cref="Color"/> of the Popup.
+	/// Sets the padding between the <see cref="Popup"/> border and the <see cref="Popup"/> content
 	/// </summary>
-	/// <remarks>
-	/// This color sets the native background color of the <see cref="Popup"/>, which is
-	/// independent of any background color configured in the actual View.
-	/// </remarks>
-	public Color Color
+	public new Thickness Padding
 	{
-		get => (Color)GetValue(ColorProperty);
-		set => SetValue(ColorProperty, value);
+		get => base.Padding;
+		set => base.Padding = value;
 	}
 
 	/// <summary>
-	/// Gets or sets the <see cref="LayoutOptions"/> for positioning the <see cref="Popup"/> vertically on the screen.
+	/// Sets the horizontal position of the <see cref="Popup"/> when displayed on screen
 	/// </summary>
-	public LayoutAlignment VerticalOptions
+	public new LayoutOptions HorizontalOptions
 	{
-		get => (LayoutAlignment)GetValue(VerticalOptionsProperty);
-		set => SetValue(VerticalOptionsProperty, value);
+		get => base.HorizontalOptions;
+		set => base.HorizontalOptions = value;
 	}
 
 	/// <summary>
-	/// Gets or sets the <see cref="LayoutOptions"/> for positioning the <see cref="Popup"/> horizontally on the screen.
+	/// Sets the vertical position of the <see cref="Popup"/> when displayed on screen
 	/// </summary>
-	public LayoutAlignment HorizontalOptions
+	public new LayoutOptions VerticalOptions
 	{
-		get => (LayoutAlignment)GetValue(HorizontalOptionsProperty);
-		set => SetValue(HorizontalOptionsProperty, value);
+		get => base.VerticalOptions;
+		set => base.VerticalOptions = value;
 	}
 
 	/// <summary>
-	/// Gets or sets the <see cref="Size"/> of the Popup Display.
+	/// Close the Popup.
 	/// </summary>
-	/// <remarks>
-	/// The Popup will always try to constrain the actual size of the <see cref="Popup" />
-	/// to the <see cref="Popup" /> of the View unless a <see cref="Size"/> is specified.
-	/// If the <see cref="Popup" /> contains <see cref="LayoutOptions"/> a <see cref="Size"/>
-	/// will be required. This will allow the View to have a concept of <see cref="Size"/>
-	/// that varies from the actual <see cref="Size"/> of the <see cref="Popup" />
-	/// </remarks>
-	public Size Size
-	{
-		get => (Size)GetValue(SizeProperty);
-		set => SetValue(SizeProperty, value);
-	}
+	public virtual Task Close(CancellationToken token = default) => GetPopupPage().Close(new PopupResult(false), token);
 
-	/// <summary>
-	/// Gets or sets a value indicating whether the popup can be dismissed by tapping outside the Popup.
-	/// </summary>
-	/// <remarks>
-	/// When true and the user taps outside the popup, it will dismiss.
-	/// On Android - when false the hardware back button is disabled.
-	/// </remarks>
-	public bool CanBeDismissedByTappingOutsideOfPopup
+	internal void NotifyPopupIsOpened()
 	{
-		get => (bool)GetValue(CanBeDismissedByTappingOutsideOfPopupProperty);
-		set => SetValue(CanBeDismissedByTappingOutsideOfPopupProperty, value);
+		Opened?.Invoke(this, EventArgs.Empty);
 	}
 
-	/// <summary>
-	/// Gets or sets the <see cref="Style"/> of the Popup.
-	/// </summary>
-	public Style Style
+	internal void NotifyPopupIsClosed()
 	{
-		get => (Style)GetValue(StyleProperty);
-		set => SetValue(StyleProperty, value);
+		Closed?.Invoke(this, EventArgs.Empty);
 	}
 
-	/// <summary>
-	/// Gets or sets the <see cref="View"/> anchor.
-	/// </summary>
-	/// <remarks>
-	/// The Anchor is where the Popup will render closest to. When an Anchor is configured,
-	/// the popup will appear centered over that control or as close as possible.
-	/// </remarks>
-	public View? Anchor { get; set; }
-
-	/// <summary>
-	/// Property that represents the Window that's showing the Popup.
-	/// </summary>
-	public Window Window
+	private protected PopupPage GetPopupPage()
 	{
-		get;
-		set
-		{
-			field = value;
+		var parent = Parent;
 
-			if (Content is IWindowController controller)
-			{
-				controller.Window = value;
-			}
-		}
-	} = new();
-
-	/// <summary>
-	/// Property that represents Resources of Popup.
-	/// </summary>
-	public ResourceDictionary Resources
-	{
-		get => resources;
-		set
+		while (parent is not null)
 		{
-			ArgumentNullException.ThrowIfNull(value);
-
-			if (resources == value)
+			if (parent.Parent is PopupPage popuppage)
 			{
-				return;
+				return popuppage;
 			}
 
-			OnPropertyChanging();
-			((IResourceDictionary)resources).ValuesChanged -= OnResourcesChanged;
-
-			resources = value;
-
-			OnResourcesChanged(value);
-			((IResourceDictionary)resources).ValuesChanged += OnResourcesChanged;
-
-			OnPropertyChanged();
-		}
-	}
-
-	/// <summary>
-	/// Property that represents Style Class of Popup.
-	/// </summary>
-	[System.ComponentModel.TypeConverter(typeof(ListStringTypeConverter))]
-	public IList<string> StyleClass
-	{
-		get => mergedStyle.StyleClass;
-		set => mergedStyle.StyleClass = value;
-	}
-
-	/// <summary>
-	/// Gets or sets the result that will return when the user taps outside the Popup.
-	/// </summary>
-	protected object? ResultWhenUserTapsOutsideOfPopup { get; set; }
-
-	/// <inheritdoc/>
-	IView? IPopup.Anchor => Anchor;
-
-	/// <inheritdoc/>
-	IView? IPopup.Content => Content;
-
-	/// <inheritdoc/>
-	TaskCompletionSource IAsynchronousHandler.HandlerCompleteTCS => popupDismissedTaskCompletionSource;
-
-	/// <inheritdoc/>
-	bool IResourcesProvider.IsResourcesCreated => resources is not null;
-
-	/// <summary>
-	/// Resets the Popup.
-	/// </summary>
-	public void Reset()
-	{
-		resultTaskCompletionSource = new();
-		popupDismissedTaskCompletionSource = new();
-	}
-
-	/// <summary>
-	/// Close the current popup.
-	/// </summary>
-	/// <remarks>
-	/// <see cref="Close(object?)"/> is an <see langword="async"/> <see langword="void"/> method, commonly referred to as a fire-and-forget method.
-	/// It will complete and return to the calling thread before the operating system has dismissed the <see cref="Popup"/> from the screen.
-	/// If you need to pause the execution of your method until the operating system has dismissed the <see cref="Popup"/> from the screen, use instead <see cref="CloseAsync(object?, CancellationToken)"/>.
-	/// </remarks>
-	/// <param name="result">The result to return.</param>
-	public async void Close(object? result = null) => await CloseAsync(result, CancellationToken.None);
-
-	/// <summary>
-	/// Close the current popup.
-	/// </summary>
-	/// <remarks>
-	/// Returns once the operating system has dismissed the <see cref="IPopup"/> from the page
-	/// </remarks>
-	/// <param name="result">The result to return.</param>
-	/// <param name="token"><see cref="CancellationToken"/></param>
-	public async Task CloseAsync(object? result = null, CancellationToken token = default)
-	{
-		await OnClosed(result, false, token);
-		resultTaskCompletionSource.TrySetResult(result);
-	}
-
-	internal override void OnParentResourcesChanged(IEnumerable<KeyValuePair<string, object>> values)
-	{
-		if (values is null)
-		{
-			return;
-		}
-
-		if (!((IResourcesProvider)this).IsResourcesCreated || Resources.Count == 0)
-		{
-			base.OnParentResourcesChanged(values);
-			return;
-		}
-
-		var innerKeys = new HashSet<string>(StringComparer.Ordinal);
-		var changedResources = new List<KeyValuePair<string, object>>();
-		foreach (var keyValuePair in Resources)
-		{
-			innerKeys.Add(keyValuePair.Key);
+			parent = parent.Parent;
 		}
 
-		foreach (var keyValuePair in values)
-		{
-			if (innerKeys.Add(keyValuePair.Key))
-			{
-				changedResources.Add(keyValuePair);
-			}
-			else if (keyValuePair.Key.StartsWith(Style.StyleClassPrefix, StringComparison.Ordinal))
-			{
-				if (Resources[keyValuePair.Key] is List<Style> innerStyle)
-				{
-					var mergedClassStyles = new List<Style>(innerStyle);
-					if (keyValuePair.Value is List<Style> parentStyle)
-					{
-						mergedClassStyles.AddRange(parentStyle);
-					}
-					changedResources.Add(new KeyValuePair<string, object>(keyValuePair.Key, mergedClassStyles));
-				}
-			}
-		}
-		if (changedResources.Count != 0)
-		{
-			OnResourcesChanged(changedResources);
-		}
+		throw new PopupNotFoundException();
 	}
+}
 
+/// <summary>
+/// Represents a small View that pops up at front the Page.
+/// </summary>
+public partial class Popup<T> : Popup
+{
 	/// <summary>
-	/// Invokes the <see cref="Opened"/> event.
-	/// </summary>
-	internal virtual void OnOpened() =>
-		openedWeakEventManager.HandleEvent(this, PopupOpenedEventArgs.Empty, nameof(Opened));
-
-	/// <summary>
-	/// Invokes the <see cref="Closed"/> event.
+	/// Close the Popup with a result.
 	/// </summary>
-	/// <param name="result">Sets the <see cref="PopupClosedEventArgs"/> Property of <see cref="PopupClosedEventArgs.Result"/>.</param>
-	/// <param name="wasDismissedByTappingOutsideOfPopup">Sets the <see cref="PopupClosedEventArgs"/> Property of <see cref="PopupClosedEventArgs.WasDismissedByTappingOutsideOfPopup"/>/>.</param>
+	/// <param name="result">Popup result</param>
 	/// <param name="token"><see cref="CancellationToken"/></param>
-	protected virtual async Task OnClosed(object? result, bool wasDismissedByTappingOutsideOfPopup, CancellationToken token = default)
-	{
-		token.ThrowIfCancellationRequested();
-
-		((IPopup)this).OnClosed(result);
-		((IResourceDictionary)resources).ValuesChanged -= OnResourcesChanged;
-
-		RemoveBinding(Popup.ContentProperty);
-		RemoveBinding(Popup.ColorProperty);
-		RemoveBinding(Popup.SizeProperty);
-		RemoveBinding(Popup.CanBeDismissedByTappingOutsideOfPopupProperty);
-		RemoveBinding(Popup.VerticalOptionsProperty);
-		RemoveBinding(Popup.HorizontalOptionsProperty);
-		RemoveBinding(Popup.StyleProperty);
-
-		await popupDismissedTaskCompletionSource.Task.WaitAsync(token);
-
-		Parent?.RemoveLogicalChild(this);
-
-		dismissWeakEventManager.HandleEvent(this, new PopupClosedEventArgs(result, wasDismissedByTappingOutsideOfPopup), nameof(Closed));
-	}
-
-	/// <summary>
-	/// Invoked when the popup is dismissed by tapping outside the popup.
-	/// </summary>
-	protected internal virtual async Task OnDismissedByTappingOutsideOfPopup(CancellationToken token = default)
-	{
-		await OnClosed(ResultWhenUserTapsOutsideOfPopup, true, token);
-		resultTaskCompletionSource.TrySetResult(ResultWhenUserTapsOutsideOfPopup);
-	}
-
-	/// <summary>
-	///<inheritdoc/>
-	/// </summary>
-	protected override void OnBindingContextChanged()
-	{
-		base.OnBindingContextChanged();
-
-		if (Content is not null)
-		{
-			SetInheritedBindingContext(Content, BindingContext);
-
-			if (ReferenceEquals(Content.Parent, this) is false)
-			{
-				Content.Parent = null;
-				Content.Parent = this;
-			}
-		}
-	}
-
-	static void OnContentChanged(BindableObject bindable, object oldValue, object newValue)
-	{
-		var popup = (Popup)bindable;
-		popup.OnBindingContextChanged();
-	}
-
-	static void OnColorChanged(BindableObject bindable, object oldValue, object newValue)
-	{
-		ArgumentNullException.ThrowIfNull(newValue);
-	}
-
-	void IPopup.OnClosed(object? result) => Handler?.Invoke(nameof(IPopup.OnClosed), result);
-
-	void IPopup.OnOpened() => OnOpened();
-
-	async void IPopup.OnDismissedByTappingOutsideOfPopup() => await OnDismissedByTappingOutsideOfPopup(CancellationToken.None);
-
-	void IPropertyPropagationController.PropagatePropertyChanged(string propertyName) =>
-		PropertyPropagationExtensions.PropagatePropertyChanged(propertyName, this, ((IVisualTreeElement)this).GetVisualChildren());
+	public virtual Task Close(T result, CancellationToken token = default) => GetPopupPage().Close(new PopupResult<T>(result, false), token);
+}
 
-	IReadOnlyList<IVisualTreeElement> IVisualTreeElement.GetVisualChildren() => Content is null ? [] : [Content];
-}
\ No newline at end of file
+class InvalidPopupOperationException(string message) : InvalidOperationException(message);
+sealed class PopupNotFoundException() : InvalidPopupOperationException($"Unable to close popup: could not locate {nameof(PopupPage)}. {nameof(PopupExtensions.ShowPopup)} or {nameof(PopupExtensions.ShowPopupAsync)} must be called before {nameof(Popup.Close)}. If using a custom implementation of {nameof(Popup)}, override the {nameof(Popup.Close)} method");
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui/Views/Popup/PopupExtensions.net.cs b/src/CommunityToolkit.Maui/Views/Popup/PopupExtensions.net.cs
deleted file mode 100644
index 2575bd7a71..0000000000
--- a/src/CommunityToolkit.Maui/Views/Popup/PopupExtensions.net.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace CommunityToolkit.Maui.Views;
-
-public static partial class PopupExtensions
-{
-	static void PlatformShowPopup(Popup popup, IMauiContext mauiContext) =>
-		throw new NotSupportedException($"The current platform '{DeviceInfo.Platform}' does not support CommunityToolkit.Maui.Core.Popup.");
-
-	static Task<object?> PlatformShowPopupAsync(Popup popup, IMauiContext mauiContext) =>
-		throw new NotSupportedException($"The current platform '{DeviceInfo.Platform}' does not support CommunityToolkit.Maui.Core.Popup.");
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui/Views/Popup/PopupExtensions.shared.cs b/src/CommunityToolkit.Maui/Views/Popup/PopupExtensions.shared.cs
deleted file mode 100644
index 490f5b5abc..0000000000
--- a/src/CommunityToolkit.Maui/Views/Popup/PopupExtensions.shared.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-using System.Runtime.CompilerServices;
-using CommunityToolkit.Maui.Core;
-using Microsoft.Maui.Controls.Platform;
-using Microsoft.Maui.Platform;
-
-namespace CommunityToolkit.Maui.Views;
-
-/// <summary>
-/// Extension methods for <see cref="Popup"/>.
-/// </summary>
-public static partial class PopupExtensions
-{
-	/// <summary>
-	/// Displays a popup.
-	/// </summary>
-	/// <param name="page">The current <see cref="Page"/>.</param>
-	/// <param name="popup">The <see cref="Popup"/> to display.</param>
-	public static void ShowPopup<TPopup>(this Page page, TPopup popup) where TPopup : Popup
-	{
-#if WINDOWS
-		// TODO: This is a workaround for https://github.com/dotnet/maui/issues/12970. Remove this `#if Windows` block when the issue is closed
-		page.GetCurrentPage().Loaded += handler;
-
-		void handler(object? sender, EventArgs args)
-		{
-			ArgumentNullException.ThrowIfNull(sender);
-
-			var page = (Page)sender;
-
-			page.GetCurrentPage().Loaded -= handler;
-
-			CreateAndShowPopup(page, popup);
-		}
-#else
-		if (page.IsPlatformEnabled)
-		{
-			CreateAndShowPopup(page, popup);
-		}
-		else
-		{
-			void handler(object? sender, EventArgs args)
-			{
-				page.Loaded -= handler;
-
-				CreateAndShowPopup(page, popup);
-			}
-
-			page.Loaded += handler;
-		}
-#endif
-	}
-
-	/// <summary>
-	/// Displays a popup and returns a result.
-	/// </summary>
-	/// <param name="page">The current <see cref="Page"/>.</param>
-	/// <param name="popup">The <see cref="Popup"/> to display.</param>
-	/// <param name="token"><see cref="CancellationToken"/></param>
-	/// <returns>
-	/// A task that will complete once the <see cref="Popup"/> is dismissed.
-	/// </returns>
-	public static Task<object?> ShowPopupAsync<TPopup>(this Page page, TPopup popup, CancellationToken token = default) where TPopup : Popup
-	{
-#if WINDOWS
-		// TODO: This is a workaround for https://github.com/dotnet/maui/issues/12970. Remove this `#if Windows` block when the issue is closed   
-		var taskCompletionSource = new TaskCompletionSource<object?>();
-
-		page.GetCurrentPage().Unloaded += unloadedHandler;
-		page.GetCurrentPage().Loaded += loadedHandler;
-
-		return taskCompletionSource.Task.WaitAsync(token);
-
-		static void unloadedHandler(object? sender, EventArgs args) { }
-
-		async void loadedHandler(object? sender, EventArgs args)
-		{
-			ArgumentNullException.ThrowIfNull(sender);
-
-			var page = (Page)sender;
-
-			page.Unloaded -= unloadedHandler;
-			page.Loaded -= loadedHandler;
-
-			try
-			{
-				var result = await CreateAndShowPopupAsync(page, popup, token);
-
-				taskCompletionSource.TrySetResult(result);
-			}
-			catch (Exception ex)
-			{
-				taskCompletionSource.TrySetException(ex);
-			}
-		}
-#else
-		if (page.IsPlatformEnabled)
-		{
-			return CreateAndShowPopupAsync(page, popup, token);
-		}
-		else
-		{
-			var taskCompletionSource = new TaskCompletionSource<object?>();
-
-			async void handler(object? sender, EventArgs args)
-			{
-				page.Loaded -= handler;
-
-				try
-				{
-					var result = await CreateAndShowPopupAsync(page, popup, token);
-
-					taskCompletionSource.TrySetResult(result);
-				}
-				catch (Exception ex)
-				{
-					taskCompletionSource.TrySetException(ex);
-				}
-			}
-
-			page.Loaded += handler;
-
-			return taskCompletionSource.Task;
-		}
-#endif
-	}
-
-	static void CreatePopup(Page page, Popup popup)
-	{
-		var mauiContext = GetMauiContext(page);
-
-		var parent = page.GetCurrentPage();
-		parent?.AddLogicalChild(popup);
-
-		var platformPopup = popup.ToHandler(mauiContext);
-		platformPopup.Invoke(nameof(IPopup.OnOpened));
-	}
-
-	[MethodImpl(MethodImplOptions.AggressiveInlining)]
-	static IMauiContext GetMauiContext(Page page)
-	{
-		return page.Handler?.MauiContext ?? throw new InvalidOperationException("Could not locate MauiContext.");
-	}
-
-	static void CreateAndShowPopup<TPopup>(Page page, TPopup popup) where TPopup : Popup
-	{
-#if WINDOWS
-		PlatformShowPopup(popup, GetMauiContext(page));
-#else
-		CreatePopup(page, popup);
-#endif
-	}
-
-	static Task<object?> CreateAndShowPopupAsync<TPopup>(this Page page, TPopup popup, CancellationToken token) where TPopup : Popup
-	{
-#if WINDOWS
-		return PlatformShowPopupAsync(popup, GetMauiContext(page), token);
-#else
-		CreatePopup(page, popup);
-
-		return popup.Result.WaitAsync(token);
-#endif
-	}
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui/Views/Popup/PopupExtensions.windows.cs b/src/CommunityToolkit.Maui/Views/Popup/PopupExtensions.windows.cs
deleted file mode 100644
index 34582f944e..0000000000
--- a/src/CommunityToolkit.Maui/Views/Popup/PopupExtensions.windows.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using CommunityToolkit.Maui.Core;
-using Microsoft.Maui.Platform;
-
-namespace CommunityToolkit.Maui.Views;
-
-/// <summary>
-/// Extension methods for <see cref="Popup"/>.
-/// </summary>
-public static partial class PopupExtensions
-{
-	static void PlatformShowPopup(Popup popup, IMauiContext mauiContext)
-	{
-		if (mauiContext.GetPlatformWindow().GetWindow()?.Content is not Page parent)
-		{
-			throw new InvalidOperationException("Window Content cannot be null");
-		}
-
-		parent.AddLogicalChild(popup);
-
-		var platform = popup.ToHandler(mauiContext);
-		platform?.Invoke(nameof(IPopup.OnOpened));
-	}
-
-	static Task<object?> PlatformShowPopupAsync(Popup popup, IMauiContext mauiContext, CancellationToken token)
-	{
-		PlatformShowPopup(popup, mauiContext);
-		return popup.Result.WaitAsync(token);
-	}
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui/Views/Popup/PopupOptions.shared.cs b/src/CommunityToolkit.Maui/Views/Popup/PopupOptions.shared.cs
new file mode 100644
index 0000000000..baba013955
--- /dev/null
+++ b/src/CommunityToolkit.Maui/Views/Popup/PopupOptions.shared.cs
@@ -0,0 +1,78 @@
+using Microsoft.Maui.Controls.Shapes;
+
+namespace CommunityToolkit.Maui;
+
+/// <summary>
+/// Popup options.
+/// </summary>
+public partial class PopupOptions : BindableObject, IPopupOptions
+{
+	/// <summary>
+	///  Backing BindableProperty for the <see cref="CanBeDismissedByTappingOutsideOfPopup"/> property.
+	/// </summary>
+	public static readonly BindableProperty CanBeDismissedByTappingOutsideOfPopupProperty = BindableProperty.Create(nameof(CanBeDismissedByTappingOutsideOfPopup), typeof(bool), typeof(PopupOptions), PopupOptionsDefaults.CanBeDismissedByTappingOutsideOfPopup);
+
+	/// <summary>
+	///  Backing BindableProperty for the <see cref="OnTappingOutsideOfPopup"/> property.
+	/// </summary>
+	public static readonly BindableProperty OnTappingOutsideOfPopupProperty = BindableProperty.Create(nameof(OnTappingOutsideOfPopup), typeof(Action), typeof(PopupOptions), PopupOptionsDefaults.OnTappingOutsideOfPopup);
+
+	/// <summary>
+	///  Backing BindableProperty for the <see cref="PageOverlayColor"/> property.
+	/// </summary>
+	public static readonly BindableProperty PageOverlayColorProperty = BindableProperty.Create(nameof(PageOverlayColor), typeof(Color), typeof(PopupOptions), PopupOptionsDefaults.PageOverlayColor);
+
+	/// <summary>
+	///  Backing BindableProperty for the <see cref="Shape"/> property.
+	/// </summary>
+	public static readonly BindableProperty ShapeProperty = BindableProperty.Create(nameof(Shape), typeof(Shape), typeof(PopupOptions), PopupOptionsDefaults.Shape);
+
+	/// <summary>
+	///  Backing BindableProperty for the <see cref="Shadow"/> property.
+	/// </summary>
+	public static readonly BindableProperty ShadowProperty = BindableProperty.Create(nameof(Shadow), typeof(Shadow), typeof(PopupOptions), PopupOptionsDefaults.Shadow);
+
+	/// <summary>
+	/// An empty instance of <see cref="IPopupOptions"/> containing default values.
+	/// </summary>
+	public static IPopupOptions Empty { get; } = new PopupOptions();
+
+	/// <inheritdoc/>
+	/// <remarks>
+	/// When true and the user taps outside the popup, it will dismiss.
+	/// On Android - when false the hardware back button is disabled.
+	/// </remarks>
+	public bool CanBeDismissedByTappingOutsideOfPopup
+	{
+		get => (bool)GetValue(CanBeDismissedByTappingOutsideOfPopupProperty);
+		set => SetValue(CanBeDismissedByTappingOutsideOfPopupProperty, value);
+	}
+
+	/// <inheritdoc/>
+	public Color PageOverlayColor
+	{
+		get => (Color)GetValue(PageOverlayColorProperty);
+		set => SetValue(PageOverlayColorProperty, value);
+	}
+
+	/// <inheritdoc/>
+	public Action? OnTappingOutsideOfPopup
+	{
+		get => (Action?)GetValue(OnTappingOutsideOfPopupProperty);
+		set => SetValue(OnTappingOutsideOfPopupProperty, value);
+	}
+
+	/// <inheritdoc/>
+	public Shape? Shape
+	{
+		get => (Shape?)GetValue(ShapeProperty);
+		set => SetValue(ShapeProperty, value);
+	}
+
+	/// <inheritdoc/>
+	public Shadow? Shadow
+	{
+		get => (Shadow?)GetValue(ShadowProperty);
+		set => SetValue(ShadowProperty, value);
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs b/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs
new file mode 100644
index 0000000000..b1f263c2e7
--- /dev/null
+++ b/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs
@@ -0,0 +1,205 @@
+using System.ComponentModel;
+using System.Globalization;
+using CommunityToolkit.Maui.Converters;
+using CommunityToolkit.Maui.Core;
+using Microsoft.Maui.Controls.PlatformConfiguration;
+using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
+using Microsoft.Maui.Controls.Shapes;
+
+namespace CommunityToolkit.Maui.Views;
+
+sealed partial class PopupPage<T>(Popup<T> popup, IPopupOptions popupOptions) : PopupPage(popup, popupOptions)
+{
+	public PopupPage(View view, IPopupOptions popupOptions)
+		: this(view as Popup<T> ?? CreatePopupFromView<Popup<T>>(view), popupOptions)
+	{
+	}
+
+	public Task Close(PopupResult<T> result, CancellationToken token = default) => base.Close(result, token);
+}
+
+partial class PopupPage : ContentPage
+{
+	readonly Popup popup;
+	readonly IPopupOptions popupOptions;
+	readonly Command tapOutsideOfPopupCommand;
+	readonly WeakEventManager popupClosedEventManager = new();
+
+	public PopupPage(View view, IPopupOptions popupOptions)
+		: this(view as Popup ?? CreatePopupFromView<Popup>(view), popupOptions)
+	{
+		ArgumentNullException.ThrowIfNull(view);
+	}
+
+	public PopupPage(Popup popup, IPopupOptions popupOptions)
+	{
+		ArgumentNullException.ThrowIfNull(popup);
+		ArgumentNullException.ThrowIfNull(popupOptions);
+
+		this.popup = popup;
+		this.popupOptions = popupOptions;
+
+		// Only set the content if the parent constructor hasn't set the content already; don't override content if it already exists
+		base.Content ??= new PopupPageLayout(popup, popupOptions);
+
+		tapOutsideOfPopupCommand = new Command(async () =>
+		{
+			popupOptions.OnTappingOutsideOfPopup?.Invoke();
+			await Close(new PopupResult(true));
+		}, () => popupOptions.CanBeDismissedByTappingOutsideOfPopup);
+
+		Content.GestureRecognizers.Add(new TapGestureRecognizer { Command = tapOutsideOfPopupCommand });
+
+		if (popupOptions is BindableObject bindablePopupOptions)
+		{
+			bindablePopupOptions.PropertyChanged += HandlePopupPropertyChanged;
+		}
+
+		this.SetBinding(BindingContextProperty, static (Popup x) => x.BindingContext, source: popup, mode: BindingMode.OneWay);
+		this.SetBinding(BackgroundColorProperty, static (IPopupOptions options) => options.PageOverlayColor, source: popupOptions, mode: BindingMode.OneWay);
+
+		Shell.SetPresentationMode(this, PresentationMode.ModalNotAnimated);
+		On<iOS>().SetModalPresentationStyle(UIModalPresentationStyle.OverFullScreen);
+	}
+
+	public event EventHandler<IPopupResult> PopupClosed
+	{
+		add => popupClosedEventManager.AddEventHandler(value);
+		remove => popupClosedEventManager.RemoveEventHandler(value);
+	}
+
+	// Prevent Content from being set by external class
+	// Casts `PopupPage.Content` to return typeof(PopupPageLayout)
+	internal new PopupPageLayout Content => (PopupPageLayout)base.Content;
+
+	public async Task Close(PopupResult result, CancellationToken token = default)
+	{
+		// We first call `.ThrowIfCancellationRequested()` to ensure we don't throw one of the `InvalidOperationException`s (below) if the `CancellationToken` has already been canceled.
+		// This ensures we throw the correct `OperationCanceledException` in the rare scenario where a developer cancels the token, then manually calls `Navigation.PopModalAsync()` before calling `Popup.Close()`
+		// It may feel a bit redundant, given that we again call `ThrowIfCancellationRequested` later in this method, however, this ensures we propagate the correct Exception to the developer.
+		token.ThrowIfCancellationRequested(); 
+		
+		var popupPageToClose = Navigation.ModalStack.OfType<PopupPage>().LastOrDefault(popupPage => popupPage.Content == Content);
+
+		if (popupPageToClose is null)
+		{
+			throw new PopupNotFoundException();
+		}
+
+		if (Navigation.ModalStack[^1] is Microsoft.Maui.Controls.Page currentVisibleModalPage
+		    && currentVisibleModalPage != popupPageToClose)
+		{
+			throw new InvalidPopupOperationException($"Unable to close Popup because it is blocked by the Modal Page {currentVisibleModalPage.GetType().FullName}. Please call `{nameof(Navigation)}.{nameof(Navigation.PopModalAsync)}()` to first remove {currentVisibleModalPage.GetType().FullName} from the {nameof(Navigation.ModalStack)}");
+		}
+
+		// We call `.ThrowIfCancellationRequested()` again to avoid a race condition where a developer cancels the CancellationToken after we check for an InvalidOperationException
+		// At first glance, it may look redundant given that we are using `.WaitAsync(token)` in the next step,
+		// However, `Navigation.PopModalAsync()` may return a completed Task, and when a completed Task is returned, `.WaitAsync(token)` is never invoked.
+		// In other words, `.WaitAsync(token)` may not throw an `OperationCanceledException` as expected which is why we call `.ThrowIfCancellationRequested()` again here
+		// Here's the .NET MAUI Source code demonstrating that `Navigation.PopModalAsync()` sometimes returns `Task.FromResult()`: https://github.com/dotnet/maui/blob/e5c252ec7f430cbaf28c8a815a249e3270b49844/src/Controls/src/Core/NavigationProxy.cs#L192-L196
+		token.ThrowIfCancellationRequested();
+		await Navigation.PopModalAsync(false).WaitAsync(token);
+
+		popupClosedEventManager.HandleEvent(this, result, nameof(PopupClosed));
+	}
+
+	// Prevent the Android Back Button from dismissing the Popup if CanBeDismissedByTappingOutsideOfPopup is true
+	protected override bool OnBackButtonPressed()
+	{
+		if (popupOptions.CanBeDismissedByTappingOutsideOfPopup)
+		{
+			return base.OnBackButtonPressed();
+		}
+
+		return true;
+	}
+
+	protected override void OnNavigatedFrom(NavigatedFromEventArgs args)
+	{
+		popup.NotifyPopupIsClosed();
+		base.OnNavigatedFrom(args);
+	}
+
+	protected override void OnNavigatedTo(NavigatedToEventArgs args)
+	{
+		base.OnNavigatedTo(args);
+		popup.NotifyPopupIsOpened();
+	}
+
+	protected static T CreatePopupFromView<T>(in View view) where T : Popup, new()
+	{
+		ArgumentNullException.ThrowIfNull(view);
+
+		var popup = new T
+		{
+			BackgroundColor = view.BackgroundColor ??= PopupDefaults.BackgroundColor,
+			Content = view
+		};
+		popup.SetBinding(BackgroundProperty, static (View view) => view.Background, source: view, mode: BindingMode.OneWay);
+		popup.SetBinding(BackgroundColorProperty, static (View view) => view.BackgroundColor, source: view, mode: BindingMode.OneWay);
+		popup.SetBinding(Popup.MarginProperty, static (View view) => view.Margin, source: view, mode: BindingMode.OneWay);
+		popup.SetBinding(Popup.BackgroundProperty, static (View view) => view.Background, source: view, mode: BindingMode.OneWay);
+		popup.SetBinding(Popup.BackgroundColorProperty, static (View view) => view.BackgroundColor, source: view, mode: BindingMode.OneWay);
+		popup.SetBinding(Popup.VerticalOptionsProperty, static (View view) => view.VerticalOptions, source: view, mode: BindingMode.OneWay);
+		popup.SetBinding(Popup.HorizontalOptionsProperty, static (View view) => view.HorizontalOptions, source: view, mode: BindingMode.OneWay);
+
+		if (view is IPaddingElement paddingElement)
+		{
+			popup.SetBinding(Popup.PaddingProperty, static (IPaddingElement paddingElement) => paddingElement.Padding, source: paddingElement, mode: BindingMode.OneWay);
+		}
+
+		return popup;
+	}
+
+	void HandlePopupPropertyChanged(object? sender, PropertyChangedEventArgs e)
+	{
+		if (e.PropertyName == nameof(IPopupOptions.CanBeDismissedByTappingOutsideOfPopup))
+		{
+			tapOutsideOfPopupCommand.ChangeCanExecute();
+		}
+	}
+
+	internal sealed partial class PopupPageLayout : Grid
+	{
+		public PopupPageLayout(in Popup popupContent, in IPopupOptions options)
+		{
+			Background = BackgroundColor = null;
+
+			var border = new Border
+			{
+				BackgroundColor = popupContent.BackgroundColor ??= PopupDefaults.BackgroundColor,
+				Content = popupContent
+			};
+
+			// Bind `Popup` values through to Border using OneWay Bindings 
+			border.SetBinding(Border.MarginProperty, static (Popup popup) => popup.Margin, source: popupContent, mode: BindingMode.OneWay);
+			border.SetBinding(Border.PaddingProperty, static (Popup popup) => popup.Padding, source: popupContent, mode: BindingMode.OneWay);
+			border.SetBinding(Border.BackgroundProperty, static (Popup popup) => popup.Background, source: popupContent, mode: BindingMode.OneWay);
+			border.SetBinding(Border.BackgroundColorProperty, static (Popup popup) => popup.BackgroundColor, source: popupContent, mode: BindingMode.OneWay);
+			border.SetBinding(Border.VerticalOptionsProperty, static (Popup popup) => popup.VerticalOptions, source: popupContent, mode: BindingMode.OneWay);
+			border.SetBinding(Border.HorizontalOptionsProperty, static (Popup popup) => popup.HorizontalOptions, source: popupContent, mode: BindingMode.OneWay);
+
+			// Bind `PopupOptions` values through to Border using OneWay Bindings
+			border.SetBinding(Border.ShadowProperty, static (IPopupOptions options) => options.Shadow, source: options, mode: BindingMode.OneWay);
+			border.SetBinding(Border.StrokeProperty, static (IPopupOptions options) => options.Shape, source: options, converter: new BorderStrokeConverter(), mode: BindingMode.OneWay);
+			border.SetBinding(Border.StrokeShapeProperty, static (IPopupOptions options) => options.Shape, source: options, mode: BindingMode.OneWay);
+			border.SetBinding(Border.StrokeThicknessProperty, static (IPopupOptions options) => options.Shape, source: options, converter: new BorderStrokeThicknessConverter(), mode: BindingMode.OneWay);
+
+			Children.Add(border);
+		}
+
+		sealed partial class BorderStrokeThicknessConverter : BaseConverterOneWay<Shape?, double>
+		{
+			public override double DefaultConvertReturnValue { get; set; } = PopupOptionsDefaults.BorderStrokeThickness;
+
+			public override double ConvertFrom(Shape? value, CultureInfo? culture) => value?.StrokeThickness ?? 0;
+		}
+
+		sealed partial class BorderStrokeConverter : BaseConverterOneWay<Shape?, Brush?>
+		{
+			public override Brush? DefaultConvertReturnValue { get; set; } = PopupOptionsDefaults.BorderStroke;
+
+			public override Brush? ConvertFrom(Shape? value, CultureInfo? culture) => value?.Stroke;
+		}
+	}
+}
\ No newline at end of file