diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3857009..8fcdf82 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -182,6 +182,27 @@ jobs:
             os: ubuntu-latest
             project: samples/Sample.Avalonia.Browser
             wasm: true
+          - name: FrontDialog (Ubuntu)
+            os: ubuntu-latest
+            project: samples/Sample.FrontDialog
+          - name: FrontDialog (Windows)
+            os: windows-latest
+            project: samples/Sample.FrontDialog
+          - name: FrontDialog (macOS)
+            os: macos-latest
+            project: samples/Sample.FrontDialog
+          - name: InfinityNavigation (Ubuntu)
+            os: ubuntu-latest
+            project: samples/Sample.InfinityNavigation
+          - name: InfinityNavigation (Windows)
+            os: windows-latest
+            project: samples/Sample.InfinityNavigation
+          - name: InfinityNavigation (macOS)
+            os: macos-latest
+            project: samples/Sample.InfinityNavigation
+          - name: WPF InfinityNavigation
+            os: windows-latest
+            project: samples/Sample.Wpf.InfinityNavigation
 
     steps:
       - uses: actions/checkout@v5
diff --git a/samples/Directory.Packages.props b/samples/Directory.Packages.props
index b506a18..c6e1ccc 100644
--- a/samples/Directory.Packages.props
+++ b/samples/Directory.Packages.props
@@ -21,6 +21,5 @@
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.6" />
     <PackageVersion Include="Microsoft.WindowsAppSDK" Version="2.3.1" />
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.28000.2526" />
-    <PackageVersion Include="Pipboy.Avalonia" Version="1.0.0" />
   </ItemGroup>
 </Project>
diff --git a/samples/Sample.Avalonia/App.axaml b/samples/Sample.Avalonia/App.axaml
index d0520c1..f83b06c 100644
--- a/samples/Sample.Avalonia/App.axaml
+++ b/samples/Sample.Avalonia/App.axaml
@@ -43,6 +43,16 @@
 			<Setter Property="VerticalContentAlignment" Value="Center" />
 			<Setter Property="HorizontalContentAlignment" Value="Center" />
 		</Style>
+		<Style Selector="Button.FloatView">
+			<Setter Property="Height" Value="30" />
+			<Setter Property="Width" Value="300" />
+			<Setter Property="IsVisible" Value="{ReflectionBinding !IsDialog}" />
+			<Setter Property="Command" Value="{ReflectionBinding FloatViewCommand}" />
+			<Setter Property="Content" Value="{ReflectionBinding FloatButtonText}"/>
+			<Setter Property="CommandParameter" Value="{ReflectionBinding $self.Tag}" />
+			<Setter Property="VerticalContentAlignment" Value="Center" />
+			<Setter Property="HorizontalContentAlignment" Value="Center" />
+		</Style>
 		<Style Selector="Button.Navigation">
 			<Setter Property="Height" Value="30" />
 			<Setter Property="Width" Value="300" />
@@ -57,6 +67,13 @@
 			<Setter Property="CommandParameter" Value="{ReflectionBinding $self.Tag}" />
 			<Setter Property="VerticalContentAlignment" Value="Center" />
 		</Style>
+		<Style Selector="Button.RouterNavigation">
+			<Setter Property="Height" Value="30" />
+			<Setter Property="Width" Value="300" />
+			<Setter Property="Command" Value="{ReflectionBinding AsyncPathNavigateAndForgetCommand}" />
+			<Setter Property="CommandParameter" Value="{ReflectionBinding $self.Tag}" />
+			<Setter Property="VerticalContentAlignment" Value="Center" />
+		</Style>
 		<Style Selector="Button.DialogShow">
 			<Setter Property="Height" Value="30" />
 			<Setter Property="Width" Value="300" />
diff --git a/samples/Sample.Avalonia/App.axaml.cs b/samples/Sample.Avalonia/App.axaml.cs
index 5bb8a3b..2db3ecb 100644
--- a/samples/Sample.Avalonia/App.axaml.cs
+++ b/samples/Sample.Avalonia/App.axaml.cs
@@ -32,6 +32,7 @@ public override void OnFrameworkInitializationCompleted()
         services.AddNavigationSupport(navigationOptions)
                 .AddFloatingSupport()
                 .AddSingletonWithAllMembers<MainWindowViewModel>()
+                .RegisterNavigationInterceptor<SampleNavigationInterceptor>()
                 .RegisterView<LightView, LightViewModel>(nameof(LightView))
                 .RegisterView<ItemsRegionView, ItemsRegionViewModel>(nameof(ItemsRegionView))
                 .RegisterView<ChildContentRegionView, ChildContentRegionViewModel>(nameof(ChildContentRegionView))
@@ -75,7 +76,7 @@ public override void OnFrameworkInitializationCompleted()
 
         if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
         {
-            desktop.MainWindow = new MainWindow(sp.GetRequiredService<AsyncNavigation.Floating.IViewPlacementService>())
+            desktop.MainWindow = new MainWindow
             {
                 DataContext = sp.GetRequiredService<MainWindowViewModel>()
             };
@@ -83,7 +84,7 @@ public override void OnFrameworkInitializationCompleted()
         }
         else if (ApplicationLifetime is ISingleViewApplicationLifetime singleViewPlatform)
         {
-            singleViewPlatform.MainView = new MainView(sp.GetRequiredService<AsyncNavigation.Floating.IViewPlacementService>())
+            singleViewPlatform.MainView = new MainView
             {
                 DataContext = sp.GetRequiredService<MainWindowViewModel>()
             };
diff --git a/samples/Sample.Avalonia/Sample.Avalonia.csproj b/samples/Sample.Avalonia/Sample.Avalonia.csproj
index 3c65a09..49033bf 100644
--- a/samples/Sample.Avalonia/Sample.Avalonia.csproj
+++ b/samples/Sample.Avalonia/Sample.Avalonia.csproj
@@ -35,8 +35,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Update="Views\TabRegionViewModel.axaml.cs">
-      <DependentUpon>TabRegionViewModel.axaml</DependentUpon>
+    <Compile Update="Views\LightView.axaml.cs">
+      <DependentUpon>LightView.axaml</DependentUpon>
     </Compile>
     <Compile Update="Views\TabRegionView.axaml.cs">
       <DependentUpon>TabRegionView.axaml</DependentUpon>
@@ -50,9 +50,6 @@
     <Compile Update="Views\HeavyView.axaml.cs">
       <DependentUpon>HeavyView.axaml</DependentUpon>
     </Compile>
-    <Compile Update="Views\HeavyView.axaml.cs">
-      <DependentUpon>HeavyView.axaml</DependentUpon>
-    </Compile>
     <Compile Update="Views\AWindow.axaml.cs">
       <DependentUpon>AWindow.axaml</DependentUpon>
     </Compile>
diff --git a/samples/Sample.Avalonia/Views/ChildContentRegionView.axaml b/samples/Sample.Avalonia/Views/ChildContentRegionView.axaml
index 0267aaa..1208232 100644
--- a/samples/Sample.Avalonia/Views/ChildContentRegionView.axaml
+++ b/samples/Sample.Avalonia/Views/ChildContentRegionView.axaml
@@ -39,10 +39,6 @@
                 Classes="Navigation"
                 Content="ToHeavyView"
                 Tag="HeavyView" />
-            <Button
-                Padding="8,4"
-                Click="FloatChildRegion_Click"
-                Content="Floating: current ChildContentRegion view" />
         </StackPanel>
         <ContentControl an:RegionManager.RegionName="ChildContentRegion" />
     </DockPanel>
diff --git a/samples/Sample.Avalonia/Views/ChildContentRegionView.axaml.cs b/samples/Sample.Avalonia/Views/ChildContentRegionView.axaml.cs
index b4b9249..4460c28 100644
--- a/samples/Sample.Avalonia/Views/ChildContentRegionView.axaml.cs
+++ b/samples/Sample.Avalonia/Views/ChildContentRegionView.axaml.cs
@@ -1,43 +1,12 @@
 using AsyncNavigation.Abstractions;
-using AsyncNavigation.Floating;
 using Avalonia.Controls;
-using Avalonia.Interactivity;
-using System;
-using System.Diagnostics;
 
 namespace Sample.Avalonia.Views;
 
 public partial class ChildContentRegionView : UserControl, IView
 {
-    private readonly IViewPlacementService? _placementService;
-
-    public ChildContentRegionView() : this(null)
-    {
-    }
-
-    public ChildContentRegionView(IViewPlacementService? placementService)
+    public ChildContentRegionView()
     {
-        _placementService = placementService;
         InitializeComponent();
     }
-
-    private async void FloatChildRegion_Click(object? sender, RoutedEventArgs e)
-    {
-        if (_placementService is null)
-            return;
-
-        try
-        {
-            await _placementService.FloatAsync("ChildContentRegion", options: new FloatingWindowOptions
-            {
-                Title = "AsyncNavigation floating ChildContentRegion",
-                Width = 720,
-                Height = 480
-            });
-        }
-        catch (Exception ex) when (ex is InvalidOperationException or NotSupportedException)
-        {
-            Debug.WriteLine($"Cannot float ChildContentRegion: {ex.Message}");
-        }
-    }
 }
diff --git a/samples/Sample.Avalonia/Views/HeavyView.axaml b/samples/Sample.Avalonia/Views/HeavyView.axaml
index acab923..4b6e1f3 100644
--- a/samples/Sample.Avalonia/Views/HeavyView.axaml
+++ b/samples/Sample.Avalonia/Views/HeavyView.axaml
@@ -27,6 +27,7 @@
                         Text="{Binding InstanceNumber}" />
                 </TextBlock>
                 <Button Classes="UnloadView" />
+                <Button Classes="FloatView" />
                 <Button Classes="CloseDialog" />
                 <ItemsControl ItemsSource="{Binding HeavyItems}">
                     <ItemsControl.ItemTemplate>
diff --git a/samples/Sample.Avalonia/Views/ItemsRegionView.axaml b/samples/Sample.Avalonia/Views/ItemsRegionView.axaml
index 43cb20d..d76789c 100644
--- a/samples/Sample.Avalonia/Views/ItemsRegionView.axaml
+++ b/samples/Sample.Avalonia/Views/ItemsRegionView.axaml
@@ -51,10 +51,6 @@
                 Classes="NavigationAndForget"
                 Content="ToLightView:Forget"
                 Tag="LightView" />
-            <Button
-                Padding="8,4"
-                Click="FloatSelectedItem_Click"
-                Content="Floating: selected ItemsRegion view" />
         </StackPanel>
         <ScrollViewer>
             <ItemsControl an:RegionManager.RegionName="ItemsRegion">
diff --git a/samples/Sample.Avalonia/Views/ItemsRegionView.axaml.cs b/samples/Sample.Avalonia/Views/ItemsRegionView.axaml.cs
index 295fba6..5a93ca3 100644
--- a/samples/Sample.Avalonia/Views/ItemsRegionView.axaml.cs
+++ b/samples/Sample.Avalonia/Views/ItemsRegionView.axaml.cs
@@ -1,42 +1,12 @@
-using AsyncNavigation.Abstractions;
-using AsyncNavigation.Floating;
+using AsyncNavigation.Abstractions;
 using Avalonia.Controls;
-using Avalonia.Interactivity;
-using System;
-using System.Diagnostics;
 
 namespace Sample.Avalonia.Views;
 
 public partial class ItemsRegionView : UserControl, IView
 {
-    private readonly IViewPlacementService? _placementService;
-
-    public ItemsRegionView() : this(null)
-    {
-    }
-
-    public ItemsRegionView(IViewPlacementService? placementService)
+    public ItemsRegionView()
     {
-        _placementService = placementService;
         InitializeComponent();
     }
-    private async void FloatSelectedItem_Click(object? sender, RoutedEventArgs e)
-    {
-        if (_placementService is null)
-            return;
-
-        try
-        {
-            await _placementService.FloatAsync("ItemsRegion", options: new FloatingWindowOptions
-            {
-                Title = "AsyncNavigation floating ItemsRegion item",
-                Width = 720,
-                Height = 480
-            });
-        }
-        catch (Exception ex) when (ex is InvalidOperationException or NotSupportedException)
-        {
-            Debug.WriteLine($"Cannot float ItemsRegion: {ex.Message}");
-        }
-    }
 }
diff --git a/samples/Sample.Avalonia/Views/TabRegionViewModel.axaml b/samples/Sample.Avalonia/Views/LightView.axaml
similarity index 85%
rename from samples/Sample.Avalonia/Views/TabRegionViewModel.axaml
rename to samples/Sample.Avalonia/Views/LightView.axaml
index e87382c..98da0db 100644
--- a/samples/Sample.Avalonia/Views/TabRegionViewModel.axaml
+++ b/samples/Sample.Avalonia/Views/LightView.axaml
@@ -27,8 +27,13 @@
                         Text="{Binding InstanceNumber}" />
                 </TextBlock>
                 <Button Classes="UnloadView" />
+                <Button Classes="FloatView" />
                 <Button Classes="CloseDialog" />
                 <Button Classes="CloseDialogWithCancelling" />
+                <CheckBox
+                    Margin="4"
+                    Content="Block leaving (INavigationGuard)"
+                    IsChecked="{Binding PreventLeave}" />
             </StackPanel>
         </Border>
     </DockPanel>
diff --git a/samples/Sample.Avalonia/Views/TabRegionViewModel.axaml.cs b/samples/Sample.Avalonia/Views/LightView.axaml.cs
similarity index 100%
rename from samples/Sample.Avalonia/Views/TabRegionViewModel.axaml.cs
rename to samples/Sample.Avalonia/Views/LightView.axaml.cs
diff --git a/samples/Sample.Avalonia/Views/ListBoxRegionView.axaml b/samples/Sample.Avalonia/Views/ListBoxRegionView.axaml
index b722b51..c7406a2 100644
--- a/samples/Sample.Avalonia/Views/ListBoxRegionView.axaml
+++ b/samples/Sample.Avalonia/Views/ListBoxRegionView.axaml
@@ -24,10 +24,6 @@
                 Classes="Navigation"
                 Content="ToHeavyView"
                 Tag="HeavyView" />
-            <Button
-                Padding="8,4"
-                Click="FloatSelectedItem_Click"
-                Content="Floating: selected CustomListBoxRegion view" />
         </StackPanel>
         <ListBox an:RegionManager.RegionName="CustomListBoxRegion" />
     </DockPanel>
diff --git a/samples/Sample.Avalonia/Views/ListBoxRegionView.axaml.cs b/samples/Sample.Avalonia/Views/ListBoxRegionView.axaml.cs
index a4defcd..f09dec9 100644
--- a/samples/Sample.Avalonia/Views/ListBoxRegionView.axaml.cs
+++ b/samples/Sample.Avalonia/Views/ListBoxRegionView.axaml.cs
@@ -1,43 +1,12 @@
 using AsyncNavigation.Abstractions;
-using AsyncNavigation.Floating;
 using Avalonia.Controls;
-using Avalonia.Interactivity;
-using System;
-using System.Diagnostics;
 
 namespace Sample.Avalonia.Views;
 
 public partial class ListBoxRegionView : UserControl, IView
 {
-    private readonly IViewPlacementService? _placementService;
-
-    public ListBoxRegionView() : this(null)
-    {
-    }
-
-    public ListBoxRegionView(IViewPlacementService? placementService)
+    public ListBoxRegionView()
     {
-        _placementService = placementService;
         InitializeComponent();
     }
-
-    private async void FloatSelectedItem_Click(object? sender, RoutedEventArgs e)
-    {
-        if (_placementService is null)
-            return;
-
-        try
-        {
-            await _placementService.FloatAsync("CustomListBoxRegion", options: new FloatingWindowOptions
-            {
-                Title = "AsyncNavigation floating CustomListBoxRegion item",
-                Width = 720,
-                Height = 480
-            });
-        }
-        catch (Exception ex) when (ex is InvalidOperationException or NotSupportedException)
-        {
-            Debug.WriteLine($"Cannot float CustomListBoxRegion: {ex.Message}");
-        }
-    }
 }
diff --git a/samples/Sample.Avalonia/Views/MainView.axaml b/samples/Sample.Avalonia/Views/MainView.axaml
index 26f5c0f..6ec7b9c 100644
--- a/samples/Sample.Avalonia/Views/MainView.axaml
+++ b/samples/Sample.Avalonia/Views/MainView.axaml
@@ -10,15 +10,9 @@
     d:DesignWidth="800"
     x:DataType="vm:MainWindowViewModel"
     mc:Ignorable="d">
-    <Grid RowDefinitions="Auto,*,30">
-        <Border Grid.Row="0" Padding="8">
-            <StackPanel Orientation="Horizontal" Spacing="8">
-                <Button Click="FloatMainRegion_Click" Content="Floating: current MainRegion view" />
-                <TextBlock VerticalAlignment="Center" Text="The same UserControl instance moves to the window; use Dock to region to return it. Closing closes the view." />
-            </StackPanel>
-        </Border>
+    <Grid RowDefinitions="*,30">
         <SplitView
-            Grid.Row="1"
+            Grid.Row="0"
             DisplayMode="CompactInline"
             IsPaneOpen="{Binding IsSplitViewPaneOpen}"
             OpenPaneLength="310"
@@ -126,6 +120,19 @@
                             Classes="WindowShow"
                             Content="ToLightView:Window.Show"
                             Tag="AWindow" />
+                        <Separator Margin="4" />
+                        <Button
+                            Classes="RouterNavigation"
+                            Content="Router: Path_ChildHeavyView"
+                            Tag="Path_ChildHeavyView" />
+                        <Button
+                            Classes="RouterNavigation"
+                            Content="Router: Tab/Tab_A (segments)"
+                            Tag="/Tab/Tab_A" />
+                        <Button
+                            Classes="RouterNavigation"
+                            Content="Router: unknown path (fallback)"
+                            Tag="Path_UnknownView" />
                         <Button
                             Command="{Binding CollectCommand}"
                             Content="Collect"
@@ -140,7 +147,7 @@
         </SplitView>
         <SelectableTextBlock
             Name="footer"
-            Grid.Row="2"
+            Grid.Row="1"
             HorizontalAlignment="Center"
             VerticalAlignment="Center" />
     </Grid>
diff --git a/samples/Sample.Avalonia/Views/MainView.axaml.cs b/samples/Sample.Avalonia/Views/MainView.axaml.cs
index 0157044..bd36f01 100644
--- a/samples/Sample.Avalonia/Views/MainView.axaml.cs
+++ b/samples/Sample.Avalonia/Views/MainView.axaml.cs
@@ -1,49 +1,16 @@
-using AsyncNavigation.Core;
-using AsyncNavigation.Floating;
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Data;
-using Avalonia.Interactivity;
 using Sample.Common;
-using System;
-using System.Diagnostics;
 
 namespace Sample.Avalonia.Views;
 
 public partial class MainView : UserControl
 {
-    private readonly IViewPlacementService? _placementService;
-
-    public MainView() : this(null)
-    {
-    }
-
-    public MainView(IViewPlacementService? placementService)
+    public MainView()
     {
-        _placementService = placementService;
         InitializeComponent();
     }
 
-    private async void FloatMainRegion_Click(object? sender, RoutedEventArgs e)
-    {
-        if (_placementService is null)
-            return;
-
-        try
-        {
-            await _placementService.FloatAsync("MainRegion", options: new FloatingWindowOptions
-            {
-                Title = "AsyncNavigation floating MainRegion",
-                Width = 900,
-                Height = 600
-            });
-        }
-        catch (Exception ex) when (ex is InvalidOperationException or NotSupportedException)
-        {
-            Debug.WriteLine($"Cannot float MainRegion: {ex.Message}");
-        }
-    }
-
     protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
     {
         base.OnAttachedToVisualTree(e);
@@ -53,4 +20,4 @@ protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
             footer.Text = $"{mainWindowViewModel.FooterText} - Avalonia:{typeof(Application).Assembly.GetName().Version}";
         }
     }
-}
\ No newline at end of file
+}
diff --git a/samples/Sample.Avalonia/Views/MainWindow.axaml.cs b/samples/Sample.Avalonia/Views/MainWindow.axaml.cs
index d5820ac..e6be822 100644
--- a/samples/Sample.Avalonia/Views/MainWindow.axaml.cs
+++ b/samples/Sample.Avalonia/Views/MainWindow.axaml.cs
@@ -1,22 +1,13 @@
-using Avalonia.Controls;
-
-using AsyncNavigation.Floating;
+using Avalonia.Controls;
 
 namespace Sample.Avalonia.Views
 {
     public partial class MainWindow : Window
     {
-        public MainWindow() : this(null)
-        {
-        }
-
-        public MainWindow(IViewPlacementService? placementService)
+        public MainWindow()
         {
             InitializeComponent();
-            // MainView carries the whole app UI (including the "float MainRegion" demo), shared
-            // as-is with the single-view (browser/mobile) lifetime in App.axaml.cs, so desktop
-            // and single-view platforms show exactly the same floating samples.
-            Content = new MainView(placementService);
+            Content = new MainView();
         }
     }
 }
diff --git a/samples/Sample.Avalonia/Views/TabRegionView.axaml b/samples/Sample.Avalonia/Views/TabRegionView.axaml
index 3bf22f5..221630d 100644
--- a/samples/Sample.Avalonia/Views/TabRegionView.axaml
+++ b/samples/Sample.Avalonia/Views/TabRegionView.axaml
@@ -45,27 +45,6 @@
                 Classes="NavigationAndForget"
                 Content="ToLightView:Forget;New"
                 Tag="LightView:New" />
-            <Separator Margin="4" />
-            <TextBlock
-                Width="170"
-                Margin="4"
-                FontWeight="SemiBold"
-                Text="Floating region demo"
-                TextWrapping="Wrap" />
-            <TextBlock
-                Width="170"
-                Margin="4"
-                Text="1. Open LightView or HeavyView.&#x0a;2. Select the tab.&#x0a;3. Float the selected tab."
-                TextWrapping="Wrap" />
-            <Button
-                Padding="8,4"
-                Click="FloatCurrent_Click"
-                Content="Floating: selected TabRegion view" />
-            <TextBlock
-                Width="170"
-                Margin="4"
-                Text="Use Dock to region to restore the tab; closing the window closes it."
-                TextWrapping="Wrap" />
         </StackPanel>
         <ScrollViewer>
             <TabControl
diff --git a/samples/Sample.Avalonia/Views/TabRegionView.axaml.cs b/samples/Sample.Avalonia/Views/TabRegionView.axaml.cs
index 66460c4..8b3c036 100644
--- a/samples/Sample.Avalonia/Views/TabRegionView.axaml.cs
+++ b/samples/Sample.Avalonia/Views/TabRegionView.axaml.cs
@@ -1,43 +1,12 @@
-using AsyncNavigation.Abstractions;
+using AsyncNavigation.Abstractions;
 using Avalonia.Controls;
-using AsyncNavigation.Floating;
-using Avalonia.Interactivity;
-using System.Diagnostics;
-using System;
 
 namespace Sample.Avalonia.Views;
 
 public partial class TabRegionView : UserControl, IView
 {
-    private readonly IViewPlacementService? _placementService;
-
-    public TabRegionView() : this(null)
-    {
-    }
-
-    public TabRegionView(IViewPlacementService? placementService)
+    public TabRegionView()
     {
-        _placementService = placementService;
         InitializeComponent();
     }
-
-    private async void FloatCurrent_Click(object? sender, RoutedEventArgs e)
-    {
-        if (_placementService is null)
-            return;
-
-        try
-        {
-            await _placementService.FloatAsync("TabRegion", options: new FloatingWindowOptions
-            {
-                Title = "AsyncNavigation floating tab",
-                Width = 720,
-                Height = 480
-            });
-        }
-        catch (Exception ex) when (ex is InvalidOperationException or NotSupportedException)
-        {
-            Debug.WriteLine($"Cannot float tab: {ex.Message}");
-        }
-    }
 }
diff --git a/samples/Sample.Avalonia/Views/TabbedPageView.axaml b/samples/Sample.Avalonia/Views/TabbedPageView.axaml
index 50f1019..3dd21c9 100644
--- a/samples/Sample.Avalonia/Views/TabbedPageView.axaml
+++ b/samples/Sample.Avalonia/Views/TabbedPageView.axaml
@@ -43,13 +43,7 @@
                 Tag="HeavyView" />
         </StackPanel>
         <Border>
-            <TabbedPage an:RegionManager.RegionName="TabbedPageRegion" TabPlacement="Top">
-                <!--<TabbedPage.IconTemplate>
-                    <DataTemplate>
-                        <Image Source="{Binding}" />
-                    </DataTemplate>
-                </TabbedPage.IconTemplate>-->
-            </TabbedPage>
+            <TabbedPage an:RegionManager.RegionName="TabbedPageRegion" TabPlacement="Top" />
         </Border>
     </DockPanel>
 
diff --git a/samples/Sample.Common/HeavyViewModel.cs b/samples/Sample.Common/HeavyViewModel.cs
index c7e4956..cca3ba8 100644
--- a/samples/Sample.Common/HeavyViewModel.cs
+++ b/samples/Sample.Common/HeavyViewModel.cs
@@ -1,6 +1,7 @@
 using AsyncNavigation;
 using AsyncNavigation.Abstractions;
 using AsyncNavigation.Core;
+using AsyncNavigation.Floating;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.ComponentModel;
 using System.Collections.ObjectModel;
@@ -9,6 +10,13 @@ namespace Sample.Common;
 
 public partial class HeavyViewModel : InstanceCounterViewModel<HeavyViewModel>, IDialogAware, INavigationMetadata
 {
+    private readonly IViewPlacementService? _viewPlacementService;
+
+    public HeavyViewModel(IViewPlacementService? viewPlacementService = null)
+    {
+        _viewPlacementService = viewPlacementService;
+    }
+
     public ObservableCollection<HeavyItemViewModel> HeavyItems
     {
         get;
@@ -23,7 +31,13 @@ public ObservableCollection<HeavyItemViewModel> HeavyItems
     [RelayCommand]
     private Task UnloadView(string param)
     {
-        return RequestUnloadAsync(CancellationToken.None);
+        return UnloadOrCloseFloatingAsync(_viewPlacementService);
+    }
+
+    [RelayCommand]
+    private Task FloatView(string param)
+    {
+        return FloatOrDockAsync(_viewPlacementService);
     }
 
     [RelayCommand]
diff --git a/samples/Sample.Common/LightViewModel.cs b/samples/Sample.Common/LightViewModel.cs
index 7b44b44..efa7629 100644
--- a/samples/Sample.Common/LightViewModel.cs
+++ b/samples/Sample.Common/LightViewModel.cs
@@ -1,12 +1,19 @@
-using AsyncNavigation.Abstractions;
+using AsyncNavigation;
+using AsyncNavigation.Abstractions;
 using AsyncNavigation.Core;
+using AsyncNavigation.Floating;
+using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 
 namespace Sample.Common;
 
-public partial class LightViewModel : InstanceCounterViewModel<LightViewModel>, IDialogAware, INavigationMetadata
+public partial class LightViewModel : InstanceCounterViewModel<LightViewModel>, IDialogAware, INavigationMetadata, INavigationGuard
 {
     private readonly IRegionManager _regionManager;
+    private readonly IViewPlacementService? _viewPlacementService;
+
+    [ObservableProperty]
+    private bool _preventLeave;
 
     public event AsyncEventHandler<DialogCloseEventArgs>? RequestCloseAsync;
 
@@ -14,18 +21,28 @@ public partial class LightViewModel : InstanceCounterViewModel<LightViewModel>,
 
     public IconDescriptor Icon => IconDescriptor.FromFile("Icon.png");
 
-    public LightViewModel(IRegionManager regionManager)
+    public LightViewModel(IRegionManager regionManager, IViewPlacementService? viewPlacementService = null)
     {
         _regionManager = regionManager;
+        _viewPlacementService = viewPlacementService;
     }
 
 
     [RelayCommand]
     private Task UnloadView(string param)
     {
-        return RequestUnloadAsync(CancellationToken.None);
+        return UnloadOrCloseFloatingAsync(_viewPlacementService);
+    }
+
+    [RelayCommand]
+    private Task FloatView(string param)
+    {
+        return FloatOrDockAsync(_viewPlacementService);
     }
 
+    public Task<bool> CanNavigateAsync(NavigationContext context, CancellationToken cancellationToken) =>
+        Task.FromResult(!PreventLeave);
+
     [RelayCommand]
     private Task CloseDialog(string param)
     {
diff --git a/samples/Sample.Common/MainWindowViewModel.cs b/samples/Sample.Common/MainWindowViewModel.cs
index 05f2582..bb61a7c 100644
--- a/samples/Sample.Common/MainWindowViewModel.cs
+++ b/samples/Sample.Common/MainWindowViewModel.cs
@@ -14,20 +14,17 @@ public partial class MainWindowViewModel : ViewModelBase
     private readonly IRegionManager _regionManager;
     private readonly IDialogService _dialogService;
     private readonly IRegistrationTracker _registrationTracker;
-    private readonly IRouter? _router;
-    
-    public MainWindowViewModel(IRegionManager regionManager, 
+
+    public MainWindowViewModel(IRegionManager regionManager,
         IDialogService dialogService,
-        IRegistrationTracker registrationTracker,
-        IRouter? router = null)
+        IRegistrationTracker registrationTracker)
     {
-        _router = router;
         _regionManager = regionManager;
         _dialogService = dialogService;
         _registrationTracker = registrationTracker;
         _regionManager
             .RequestNavigateAsync("MainRegion", "LightView", replay: false)
-            .ContinueWith(t => 
+            .ContinueWith(t =>
             {
                 if (t.IsFaulted)
                 {
@@ -37,22 +34,12 @@ public MainWindowViewModel(IRegionManager regionManager,
 
         if(_regionManager.TryGetRegion("MainRegion", out var mainRegion))
         {
-            mainRegion.Navigated += (s, e) => 
+            mainRegion.Navigated += (s, e) =>
             {
                 Debug.WriteLine($"Navigated:{e.Context}");
             };
         }
         Views = _registrationTracker.TryGetViews(out var views) ? [.. views] : [];
-
-        if (_router is not null)
-        {
-            foreach (var mappedNavigation in _router.Routes)
-            {
-                Views.Add(mappedNavigation.Path);
-            }
-            Views.Add("/Tab/Tab_A");
-        }
-
     }
 
     public string FooterText => $"Powered by .NET {Environment.Version} • {RuntimeInformation.OSDescription}";
@@ -69,11 +56,7 @@ partial void OnSelectedViewChanged(string? value)
         if (string.IsNullOrWhiteSpace(value))
             return;
 
-        // Paths use router navigation; all other values are registered view names.
-        if (value.StartsWith("/", StringComparison.OrdinalIgnoreCase))
-            AsyncPathNavigateAndForget(value);
-        else
-            AsyncNavigateAndForget(value);
+        AsyncNavigateAndForget(value);
     }
 
     private bool CanUseDialogs() => !OperatingSystem.IsBrowser();
@@ -92,26 +75,39 @@ public static bool FilterPredicate(string? search, object? item)
     private async Task AsyncNavigate(string param)
     {
         var (viewName, parameters) = SampleHelper.ParseNavigationParam(param);
-        var result = await _regionManager.RequestNavigateAsync("MainRegion", viewName, parameters);
-        Debug.WriteLine(result.Duration.TotalMilliseconds);
+        try
+        {
+            var result = await _regionManager.RequestNavigateAsync("MainRegion", viewName, parameters);
+            Debug.WriteLine(result.Duration.TotalMilliseconds);
+        }
+        catch (OperationCanceledException ex)
+        {
+            Debug.WriteLine($"Navigation to '{viewName}' was blocked: {ex.Message}");
+        }
     }
 
     [RelayCommand]
     private void AsyncNavigateAndForget(string param)
     {
         var (viewName, parameters) = SampleHelper.ParseNavigationParam(param);
-        _ = _regionManager.RequestNavigateAsync("MainRegion", viewName, parameters).ContinueWith(t => 
+        _ = _regionManager.RequestNavigateAsync("MainRegion", viewName, parameters).ContinueWith(t =>
         {
-            var result = t.Result;
-            Debug.WriteLine(result.Duration.TotalMilliseconds);
+            if (t.IsFaulted || t.IsCanceled)
+                Debug.WriteLine($"Navigation to '{viewName}' was blocked: {t.Exception?.GetBaseException().Message}");
+            else
+                Debug.WriteLine(t.Result.Duration.TotalMilliseconds);
         });
     }
+
+    [RelayCommand]
     private void AsyncPathNavigateAndForget(string path)
     {
         _ = _regionManager.RequestPathNavigateAsync(path).ContinueWith(t =>
         {
-            var result = t.Result;
-            Debug.WriteLine($"RequestPathNavigateAsync:{result.Duration.TotalMilliseconds}");
+            if (t.IsFaulted || t.IsCanceled)
+                Debug.WriteLine($"Router navigation to '{path}' failed: {t.Exception?.GetBaseException().Message}");
+            else
+                Debug.WriteLine($"RequestPathNavigateAsync:{t.Result.Duration.TotalMilliseconds}");
         });
     }
     [RelayCommand(CanExecute = nameof(CanUseDialogs))]
@@ -161,13 +157,27 @@ private async Task AsyncShowWindow(string param)
     [RelayCommand]
     private async Task GoForward()
     {
-        await _regionManager.GoForwardAsync("MainRegion");
+        try
+        {
+            await _regionManager.GoForwardAsync("MainRegion");
+        }
+        catch (OperationCanceledException ex)
+        {
+            Debug.WriteLine($"GoForward was blocked: {ex.Message}");
+        }
     }
 
     [RelayCommand]
     private async Task GoBack()
     {
-        await _regionManager.GoBackAsync("MainRegion");
+        try
+        {
+            await _regionManager.GoBackAsync("MainRegion");
+        }
+        catch (OperationCanceledException ex)
+        {
+            Debug.WriteLine($"GoBack was blocked: {ex.Message}");
+        }
     }
 
     [RelayCommand]
diff --git a/samples/Sample.Common/Sample.Common.csproj b/samples/Sample.Common/Sample.Common.csproj
index 4e8db0a..80703fd 100644
--- a/samples/Sample.Common/Sample.Common.csproj
+++ b/samples/Sample.Common/Sample.Common.csproj
@@ -12,6 +12,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\AsyncNavigation\AsyncNavigation.csproj" />
+    <ProjectReference Include="..\..\src\AsyncNavigation.Floating\AsyncNavigation.Floating.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/Sample.Common/SampleNavigationInterceptor.cs b/samples/Sample.Common/SampleNavigationInterceptor.cs
new file mode 100644
index 0000000..1aaf543
--- /dev/null
+++ b/samples/Sample.Common/SampleNavigationInterceptor.cs
@@ -0,0 +1,20 @@
+using AsyncNavigation;
+using AsyncNavigation.Abstractions;
+using System.Diagnostics;
+
+namespace Sample.Common;
+
+public sealed class SampleNavigationInterceptor : INavigationInterceptor
+{
+    public Task OnNavigatingAsync(NavigationContext context)
+    {
+        Debug.WriteLine($"Interceptor: navigating to '{context.ViewName}' in '{context.RegionName}'");
+        return Task.CompletedTask;
+    }
+
+    public Task OnNavigatedAsync(NavigationContext context)
+    {
+        Debug.WriteLine($"Interceptor: navigated to '{context.ViewName}' in '{context.RegionName}'");
+        return Task.CompletedTask;
+    }
+}
diff --git a/samples/Sample.Common/ViewModelBase.cs b/samples/Sample.Common/ViewModelBase.cs
index da23213..ae6512d 100644
--- a/samples/Sample.Common/ViewModelBase.cs
+++ b/samples/Sample.Common/ViewModelBase.cs
@@ -1,6 +1,7 @@
 using AsyncNavigation;
 using AsyncNavigation.Abstractions;
 using AsyncNavigation.Core;
+using AsyncNavigation.Floating;
 using CommunityToolkit.Mvvm.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
 
@@ -12,6 +13,12 @@ public abstract partial class ViewModelBase : ObservableObject, INavigationAware
     private string _name;
     [ObservableProperty]
     private bool _isDialog = false;
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(FloatButtonText))]
+    private bool _isFloating;
+
+    public string FloatButtonText => IsFloating ? "Dock to region" : "Float";
+
     public ViewModelBase()
     {
         _name = GetType().Name;
@@ -19,6 +26,9 @@ public ViewModelBase()
 
     public event AsyncEventHandler<AsyncEventArgs>? AsyncRequestUnloadEvent;
 
+    public string? RegionName { get; private set; }
+    public Guid NavigationId { get; private set; }
+
     public virtual Task InitializeAsync(NavigationContext context)
     {
         return Task.CompletedTask;
@@ -46,6 +56,8 @@ public virtual async Task OnNavigatedFromAsync(NavigationContext context)
 
     public virtual async Task OnNavigatedToAsync(NavigationContext context)
     {
+        RegionName = context.RegionName;
+        NavigationId = context.NavigationId;
         if (GetRaiseError(context))
         {
             throw new Exception($"I am an Exception from {GetType()}");
@@ -70,6 +82,45 @@ public Task RequestUnloadAsync(CancellationToken cancellationToken)
         return AsyncRequestUnloadEvent!.Invoke(this, AsyncEventArgs.Empty);
     }
 
+    protected Task UnloadOrCloseFloatingAsync(IViewPlacementService? viewPlacementService, CancellationToken cancellationToken = default)
+    {
+        var session = FindFloatingSession(viewPlacementService);
+        return session is not null ? session.CloseAsync(cancellationToken) : RequestUnloadAsync(cancellationToken);
+    }
+
+    /// <summary>
+    /// Floats this view if it isn't already floating, or docks it back into its region if it is.
+    /// Drives the floating window's own dock affordance (<see cref="FloatingWindowOptions.ShowDockButton"/>
+    /// is set to <see langword="false"/>), so the view controls both directions through one button.
+    /// </summary>
+    protected async Task FloatOrDockAsync(IViewPlacementService? viewPlacementService, CancellationToken cancellationToken = default)
+    {
+        var session = FindFloatingSession(viewPlacementService);
+        if (session is not null)
+        {
+            await session.RestoreAsync(cancellationToken);
+            return;
+        }
+        if (viewPlacementService is null || RegionName is null)
+            return;
+
+        var newSession = await viewPlacementService.FloatAsync(
+            RegionName, NavigationId, new FloatingWindowOptions { ShowDockButton = false }, cancellationToken);
+        IsFloating = true;
+        newSession.StateChanged += OnFloatingSessionStateChanged;
+    }
+
+    private void OnFloatingSessionStateChanged(object? sender, EventArgs e)
+    {
+        if (sender is not IFloatingViewSession { State: ViewPlacementState.Restored or ViewPlacementState.Closed } session)
+            return;
+        session.StateChanged -= OnFloatingSessionStateChanged;
+        IsFloating = false;
+    }
+
+    private IFloatingViewSession? FindFloatingSession(IViewPlacementService? viewPlacementService) =>
+        viewPlacementService?.FloatingViews.FirstOrDefault(s => s.NavigationId == NavigationId);
+
     private static bool TryGetDelay(NavigationContext navigationContext, [MaybeNullWhen(false)] out TimeSpan? delayTime)
     {
         if (navigationContext.Parameters is not null)
diff --git a/samples/Sample.InfinityNavigation/App.axaml b/samples/Sample.InfinityNavigation/App.axaml
index 94fa49a..cb7701a 100644
--- a/samples/Sample.InfinityNavigation/App.axaml
+++ b/samples/Sample.InfinityNavigation/App.axaml
@@ -2,9 +2,8 @@
     x:Class="Sample.InfinityNavigation.App"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:pipboy="clr-namespace:Pipboy.Avalonia;assembly=Pipboy.Avalonia"
     RequestedThemeVariant="Default">
     <Application.Styles>
-		<pipboy:PipboyTheme />
+        <FluentTheme />
     </Application.Styles>
 </Application>
\ No newline at end of file
diff --git a/samples/Sample.InfinityNavigation/App.axaml.cs b/samples/Sample.InfinityNavigation/App.axaml.cs
index 9258a19..2127064 100644
--- a/samples/Sample.InfinityNavigation/App.axaml.cs
+++ b/samples/Sample.InfinityNavigation/App.axaml.cs
@@ -2,9 +2,7 @@
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
-using Avalonia.Media;
 using Microsoft.Extensions.DependencyInjection;
-using Pipboy.Avalonia;
 using Sample.Common;
 using Sample.InfinityNavigation.Views;
 
@@ -19,7 +17,6 @@ public override void Initialize()
 
     public override void OnFrameworkInitializationCompleted()
     {
-        PipboyThemeManager.Instance.SetPrimaryColor(Color.Parse("#4CAF50"));
         var services = new ServiceCollection();
 #pragma warning disable IL2026
         services.AddNavigationSupport()
diff --git a/samples/Sample.InfinityNavigation/Sample.InfinityNavigation.csproj b/samples/Sample.InfinityNavigation/Sample.InfinityNavigation.csproj
index 08bf116..65a7de0 100644
--- a/samples/Sample.InfinityNavigation/Sample.InfinityNavigation.csproj
+++ b/samples/Sample.InfinityNavigation/Sample.InfinityNavigation.csproj
@@ -19,13 +19,13 @@
   <ItemGroup>
     <PackageReference Include="Avalonia" />
     <PackageReference Include="Avalonia.Desktop" />
+    <PackageReference Include="Avalonia.Themes.Fluent" />
     <PackageReference Include="Avalonia.Fonts.Inter"/>
 	<PackageReference Include="AvaloniaUI.DiagnosticsSupport">
 		<IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
 		<PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
 	</PackageReference>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
-    <PackageReference Include="Pipboy.Avalonia"/>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/Sample.Wpf/App.xaml b/samples/Sample.Wpf/App.xaml
index f708703..bcd68eb 100644
--- a/samples/Sample.Wpf/App.xaml
+++ b/samples/Sample.Wpf/App.xaml
@@ -21,6 +21,13 @@
             <Setter Property="CommandParameter" Value="{Binding RelativeSource={RelativeSource Mode=Self}, Path=Tag}" />
             <Setter Property="VerticalContentAlignment" Value="Center" />
         </Style>
+        <Style x:Key="RouterNavigation" TargetType="{x:Type Button}">
+            <Setter Property="Height" Value="30" />
+            <Setter Property="Width" Value="300" />
+            <Setter Property="Command" Value="{Binding AsyncPathNavigateAndForgetCommand}" />
+            <Setter Property="CommandParameter" Value="{Binding RelativeSource={RelativeSource Mode=Self}, Path=Tag}" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+        </Style>
         <Style x:Key="DialogShow" TargetType="{x:Type Button}">
             <Setter Property="Height" Value="30" />
             <Setter Property="Width" Value="300" />
@@ -76,6 +83,16 @@
             <Setter Property="VerticalContentAlignment" Value="Center" />
             <Setter Property="HorizontalContentAlignment" Value="Center" />
         </Style>
+        <Style x:Key="FloatView" TargetType="{x:Type Button}">
+            <Setter Property="Height" Value="30" />
+            <Setter Property="Width" Value="300" />
+            <Setter Property="Visibility" Value="{Binding IsDialog, Converter={StaticResource BoolToVisibilityInverted}}" />
+            <Setter Property="Command" Value="{Binding FloatViewCommand}" />
+            <Setter Property="Content" Value="{Binding FloatButtonText}" />
+            <Setter Property="CommandParameter" Value="{Binding RelativeSource={RelativeSource Mode=Self}, Path=Tag}" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="HorizontalContentAlignment" Value="Center" />
+        </Style>
         <Style x:Key="CloseDialogWithCancelling" TargetType="{x:Type Button}">
             <Setter Property="Height" Value="30" />
             <Setter Property="Width" Value="300" />
diff --git a/samples/Sample.Wpf/App.xaml.cs b/samples/Sample.Wpf/App.xaml.cs
index cff0c75..6b06d6e 100644
--- a/samples/Sample.Wpf/App.xaml.cs
+++ b/samples/Sample.Wpf/App.xaml.cs
@@ -1,7 +1,6 @@
 using AsyncNavigation.Core;
 using AsyncNavigation.Wpf;
 using Microsoft.Extensions.DependencyInjection;
-using Sample.Avalonia;
 using Sample.Common;
 using Sample.Wpf.Regions;
 using Sample.Wpf.Views;
@@ -23,6 +22,7 @@ protected override void OnStartup(StartupEventArgs e)
         services.AddNavigationSupport()
             .AddFloatingSupport()
             .AddSingleton<MainWindowViewModel>()
+            .RegisterNavigationInterceptor<SampleNavigationInterceptor>()
             .RegisterRegionAdapter<ListBoxRegionAdapter>()
             .RegisterView<LightView, LightViewModel>(nameof(LightView))
             .RegisterView<ItemsRegionView, ItemsRegionViewModel>(nameof(ItemsRegionView))
@@ -59,7 +59,7 @@ protected override void OnStartup(StartupEventArgs e)
         base.OnStartup(e);
         var converter = sp.GetRequiredService<IconDescriptorConverter>();
         Application.Current.Resources[nameof(IconDescriptorConverter)] = converter;
-        var mainWindow = new MainWindow(sp.GetRequiredService<AsyncNavigation.Floating.IViewPlacementService>())
+        var mainWindow = new MainWindow
         {
             DataContext = sp.GetRequiredService<MainWindowViewModel>()
         };
diff --git a/samples/Sample.Wpf/MainWindow.xaml b/samples/Sample.Wpf/MainWindow.xaml
index 8a53434..c4cfa07 100644
--- a/samples/Sample.Wpf/MainWindow.xaml
+++ b/samples/Sample.Wpf/MainWindow.xaml
@@ -33,10 +33,6 @@
                     <Button Style="{StaticResource GoBack}" />
                     <Button Style="{StaticResource GoForward}" />
                 </StackPanel>
-                <Button
-                    Padding="8,4"
-                    Click="FloatMainRegion_Click"
-                    Content="Floating: current MainRegion view" />
                 <Button
                     Content="ToLightView"
                     Style="{StaticResource NavigationButton}"
@@ -105,6 +101,19 @@
                     Content="ToLightView:Window.Show"
                     Style="{StaticResource WindowShow}"
                     Tag="AWindow" />
+                <Separator Margin="4" />
+                <Button
+                    Content="Router: Path_ChildHeavyView"
+                    Style="{StaticResource RouterNavigation}"
+                    Tag="Path_ChildHeavyView" />
+                <Button
+                    Content="Router: Tab/Tab_A (segments)"
+                    Style="{StaticResource RouterNavigation}"
+                    Tag="/Tab/Tab_A" />
+                <Button
+                    Content="Router: unknown path (fallback)"
+                    Style="{StaticResource RouterNavigation}"
+                    Tag="Path_UnknownView" />
                 <Button
                     Command="{Binding CollectCommand}"
                     Content="Collect"
diff --git a/samples/Sample.Wpf/MainWindow.xaml.cs b/samples/Sample.Wpf/MainWindow.xaml.cs
index 7ae99a0..9a118ca 100644
--- a/samples/Sample.Wpf/MainWindow.xaml.cs
+++ b/samples/Sample.Wpf/MainWindow.xaml.cs
@@ -1,43 +1,11 @@
-using System.Windows;
-
-using AsyncNavigation.Floating;
+using System.Windows;
 
 namespace Sample.Wpf;
 
-/// <summary>
-/// Interaction logic for MainWindow.xaml
-/// </summary>
 public partial class MainWindow : Window
 {
-    private readonly IViewPlacementService? _placementService;
-
-    public MainWindow() : this(null)
-    {
-    }
-
-    public MainWindow(IViewPlacementService? placementService)
+    public MainWindow()
     {
-        _placementService = placementService;
         InitializeComponent();
     }
-
-    private async void FloatMainRegion_Click(object sender, RoutedEventArgs e)
-    {
-        if (_placementService is null)
-            return;
-
-        try
-        {
-            await _placementService.FloatAsync("MainRegion", options: new FloatingWindowOptions
-            {
-                Title = "AsyncNavigation floating MainRegion",
-                Width = 900,
-                Height = 600
-            });
-        }
-        catch (Exception ex) when (ex is InvalidOperationException or NotSupportedException)
-        {
-            MessageBox.Show(ex.Message, "Cannot float MainRegion", MessageBoxButton.OK, MessageBoxImage.Information);
-        }
-    }
 }
diff --git a/samples/Sample.Wpf/MessageBoxIndicatorProvider.cs b/samples/Sample.Wpf/MessageBoxIndicatorProvider.cs
index 7a16c34..13793a1 100644
--- a/samples/Sample.Wpf/MessageBoxIndicatorProvider.cs
+++ b/samples/Sample.Wpf/MessageBoxIndicatorProvider.cs
@@ -3,7 +3,7 @@
 using AsyncNavigation.Core;
 using System.Windows;
 
-namespace Sample.Avalonia;
+namespace Sample.Wpf;
 
 internal class MessageBoxIndicatorProvider : IRegionIndicatorProvider
 {
diff --git a/samples/Sample.Wpf/Views/ChildContentRegionView.xaml b/samples/Sample.Wpf/Views/ChildContentRegionView.xaml
index 33ebebe..f46dc84 100644
--- a/samples/Sample.Wpf/Views/ChildContentRegionView.xaml
+++ b/samples/Sample.Wpf/Views/ChildContentRegionView.xaml
@@ -38,10 +38,6 @@
                 Content="ToHeavyView"
                 Style="{StaticResource NavigationButton}"
                 Tag="HeavyView" />
-            <Button
-                Padding="8,4"
-                Click="FloatChildRegion_Click"
-                Content="Floating: current ChildContentRegion view" />
         </StackPanel>
         <ContentControl an:RegionManager.RegionName="ChildContentRegion" />
     </DockPanel>
diff --git a/samples/Sample.Wpf/Views/ChildContentRegionView.xaml.cs b/samples/Sample.Wpf/Views/ChildContentRegionView.xaml.cs
index 9e832f7..e98323a 100644
--- a/samples/Sample.Wpf/Views/ChildContentRegionView.xaml.cs
+++ b/samples/Sample.Wpf/Views/ChildContentRegionView.xaml.cs
@@ -1,41 +1,12 @@
 using AsyncNavigation.Abstractions;
-using AsyncNavigation.Floating;
-using System.Windows;
 using System.Windows.Controls;
 
 namespace Sample.Wpf.Views;
 
 public partial class ChildContentRegionView : UserControl, IView
 {
-    private readonly IViewPlacementService? _placementService;
-
-    public ChildContentRegionView() : this(null)
-    {
-    }
-
-    public ChildContentRegionView(IViewPlacementService? placementService)
+    public ChildContentRegionView()
     {
-        _placementService = placementService;
         InitializeComponent();
     }
-
-    private async void FloatChildRegion_Click(object sender, RoutedEventArgs e)
-    {
-        if (_placementService is null)
-            return;
-
-        try
-        {
-            await _placementService.FloatAsync("ChildContentRegion", options: new FloatingWindowOptions
-            {
-                Title = "AsyncNavigation floating ChildContentRegion",
-                Width = 720,
-                Height = 480
-            });
-        }
-        catch (Exception ex) when (ex is InvalidOperationException or NotSupportedException)
-        {
-            MessageBox.Show(ex.Message, "Cannot float ChildContentRegion", MessageBoxButton.OK, MessageBoxImage.Information);
-        }
-    }
 }
diff --git a/samples/Sample.Wpf/Views/HeavyView.xaml b/samples/Sample.Wpf/Views/HeavyView.xaml
index b963cc9..b2ce5f8 100644
--- a/samples/Sample.Wpf/Views/HeavyView.xaml
+++ b/samples/Sample.Wpf/Views/HeavyView.xaml
@@ -27,6 +27,7 @@
                         Text="{Binding InstanceNumber, Mode=OneWay}" />
                 </TextBlock>
                 <Button Style="{StaticResource UnloadView}" />
+                <Button Style="{StaticResource FloatView}" />
                 <Button Style="{StaticResource CloseDialog}" />
                 <ItemsControl ItemsSource="{Binding HeavyItems}">
                     <ItemsControl.ItemTemplate>
diff --git a/samples/Sample.Wpf/Views/ItemsRegionView.xaml b/samples/Sample.Wpf/Views/ItemsRegionView.xaml
index 208ed3c..0b261aa 100644
--- a/samples/Sample.Wpf/Views/ItemsRegionView.xaml
+++ b/samples/Sample.Wpf/Views/ItemsRegionView.xaml
@@ -50,10 +50,6 @@
                 Content="ToLightView:Forget"
                 Style="{StaticResource NavigationAndForget}"
                 Tag="LightView" />
-            <Button
-                Padding="8,4"
-                Click="FloatSelectedItem_Click"
-                Content="Floating: selected ItemsRegion view" />
         </StackPanel>
         <ScrollViewer>
             <ItemsControl an:RegionManager.RegionName="ItemsRegion">
diff --git a/samples/Sample.Wpf/Views/ItemsRegionView.xaml.cs b/samples/Sample.Wpf/Views/ItemsRegionView.xaml.cs
index f349f71..3a4f839 100644
--- a/samples/Sample.Wpf/Views/ItemsRegionView.xaml.cs
+++ b/samples/Sample.Wpf/Views/ItemsRegionView.xaml.cs
@@ -1,44 +1,12 @@
-using AsyncNavigation.Abstractions;
-using AsyncNavigation.Floating;
-using System.Windows;
+using AsyncNavigation.Abstractions;
 using System.Windows.Controls;
 
 namespace Sample.Wpf.Views;
 
-/// <summary>
-/// Interaction logic for ItemsRegionView.xaml
-/// </summary>
-public partial class ItemsRegionView : UserControl,IView
+public partial class ItemsRegionView : UserControl, IView
 {
-    private readonly IViewPlacementService? _placementService;
-
-    public ItemsRegionView() : this(null)
-    {
-    }
-
-    public ItemsRegionView(IViewPlacementService? placementService)
+    public ItemsRegionView()
     {
-        _placementService = placementService;
         InitializeComponent();
     }
-
-    private async void FloatSelectedItem_Click(object sender, RoutedEventArgs e)
-    {
-        if (_placementService is null)
-            return;
-
-        try
-        {
-            await _placementService.FloatAsync("ItemsRegion", options: new FloatingWindowOptions
-            {
-                Title = "AsyncNavigation floating ItemsRegion item",
-                Width = 720,
-                Height = 480
-            });
-        }
-        catch (Exception ex) when (ex is InvalidOperationException or NotSupportedException)
-        {
-            MessageBox.Show(ex.Message, "Cannot float ItemsRegion", MessageBoxButton.OK, MessageBoxImage.Information);
-        }
-    }
 }
diff --git a/samples/Sample.Wpf/Views/LightView.xaml b/samples/Sample.Wpf/Views/LightView.xaml
index aec26e4..a868c14 100644
--- a/samples/Sample.Wpf/Views/LightView.xaml
+++ b/samples/Sample.Wpf/Views/LightView.xaml
@@ -25,8 +25,13 @@
                         Text="{Binding InstanceNumber, Mode=OneWay}" />
                 </TextBlock>
                 <Button Style="{StaticResource UnloadView}" />
+                <Button Style="{StaticResource FloatView}" />
                 <Button Style="{StaticResource CloseDialog}" />
                 <Button Style="{StaticResource CloseDialogWithCancelling}" />
+                <CheckBox
+                    Margin="4"
+                    Content="Block leaving (INavigationGuard)"
+                    IsChecked="{Binding PreventLeave}" />
             </StackPanel>
         </Border>
     </DockPanel>
diff --git a/samples/Sample.Wpf/Views/ListBoxRegionView.xaml b/samples/Sample.Wpf/Views/ListBoxRegionView.xaml
index 32958d2..efcc25a 100644
--- a/samples/Sample.Wpf/Views/ListBoxRegionView.xaml
+++ b/samples/Sample.Wpf/Views/ListBoxRegionView.xaml
@@ -23,10 +23,6 @@
                 Content="ToHeavyView"
                 Style="{StaticResource NavigationButton}"
                 Tag="HeavyView" />
-            <Button
-                Padding="8,4"
-                Click="FloatSelectedItem_Click"
-                Content="Floating: selected CustomListBoxRegion view" />
         </StackPanel>
         <ListBox an:RegionManager.RegionName="CustomListBoxRegion" />
     </DockPanel>
diff --git a/samples/Sample.Wpf/Views/ListBoxRegionView.xaml.cs b/samples/Sample.Wpf/Views/ListBoxRegionView.xaml.cs
index c7ac2d3..7064677 100644
--- a/samples/Sample.Wpf/Views/ListBoxRegionView.xaml.cs
+++ b/samples/Sample.Wpf/Views/ListBoxRegionView.xaml.cs
@@ -1,41 +1,12 @@
 using AsyncNavigation.Abstractions;
-using AsyncNavigation.Floating;
-using System.Windows;
 using System.Windows.Controls;
 
 namespace Sample.Wpf.Views;
 
 public partial class ListBoxRegionView : UserControl, IView
 {
-    private readonly IViewPlacementService? _placementService;
-
-    public ListBoxRegionView() : this(null)
-    {
-    }
-
-    public ListBoxRegionView(IViewPlacementService? placementService)
+    public ListBoxRegionView()
     {
-        _placementService = placementService;
         InitializeComponent();
     }
-
-    private async void FloatSelectedItem_Click(object sender, RoutedEventArgs e)
-    {
-        if (_placementService is null)
-            return;
-
-        try
-        {
-            await _placementService.FloatAsync("CustomListBoxRegion", options: new FloatingWindowOptions
-            {
-                Title = "AsyncNavigation floating CustomListBoxRegion item",
-                Width = 720,
-                Height = 480
-            });
-        }
-        catch (Exception ex) when (ex is InvalidOperationException or NotSupportedException)
-        {
-            MessageBox.Show(ex.Message, "Cannot float CustomListBoxRegion", MessageBoxButton.OK, MessageBoxImage.Information);
-        }
-    }
 }
diff --git a/samples/Sample.Wpf/Views/TabRegionView.xaml b/samples/Sample.Wpf/Views/TabRegionView.xaml
index 7c9502c..e6b7e1d 100644
--- a/samples/Sample.Wpf/Views/TabRegionView.xaml
+++ b/samples/Sample.Wpf/Views/TabRegionView.xaml
@@ -43,27 +43,6 @@
                 Content="ToLightView:Forget;New"
                 Style="{StaticResource NavigationAndForget}"
                 Tag="LightView:New" />
-            <Separator Margin="4" />
-            <TextBlock
-                Width="170"
-                Margin="4"
-                FontWeight="SemiBold"
-                Text="Floating region demo"
-                TextWrapping="Wrap" />
-            <TextBlock
-                Width="170"
-                Margin="4"
-                Text="1. Open LightView or HeavyView.&#x0a;2. Select the tab.&#x0a;3. Float the selected tab."
-                TextWrapping="Wrap" />
-            <Button
-                Padding="8,4"
-                Click="FloatCurrent_Click"
-                Content="Floating: selected TabRegion view" />
-            <TextBlock
-                Width="170"
-                Margin="4"
-                Text="Use Dock to region to restore the tab; closing the window closes it."
-                TextWrapping="Wrap" />
         </StackPanel>
         <ScrollViewer>
             <TabControl
diff --git a/samples/Sample.Wpf/Views/TabRegionView.xaml.cs b/samples/Sample.Wpf/Views/TabRegionView.xaml.cs
index a85c408..ef41b7e 100644
--- a/samples/Sample.Wpf/Views/TabRegionView.xaml.cs
+++ b/samples/Sample.Wpf/Views/TabRegionView.xaml.cs
@@ -1,44 +1,12 @@
-using AsyncNavigation.Abstractions;
+using AsyncNavigation.Abstractions;
 using System.Windows.Controls;
-using AsyncNavigation.Floating;
-using System.Windows;
 
 namespace Sample.Wpf.Views;
 
-/// <summary>
-/// Interaction logic for TabRegionView.xaml
-/// </summary>
 public partial class TabRegionView : UserControl, IView
 {
-    private readonly IViewPlacementService? _placementService;
-
-    public TabRegionView() : this(null)
-    {
-    }
-
-    public TabRegionView(IViewPlacementService? placementService)
+    public TabRegionView()
     {
-        _placementService = placementService;
         InitializeComponent();
     }
-
-    private async void FloatCurrent_Click(object sender, RoutedEventArgs e)
-    {
-        if (_placementService is null)
-            return;
-
-        try
-        {
-            await _placementService.FloatAsync("TabRegion", options: new FloatingWindowOptions
-            {
-                Title = "AsyncNavigation floating tab",
-                Width = 720,
-                Height = 480
-            });
-        }
-        catch (Exception ex) when (ex is InvalidOperationException or NotSupportedException)
-        {
-            MessageBox.Show(ex.Message, "Cannot float tab", MessageBoxButton.OK, MessageBoxImage.Information);
-        }
-    }
 }
diff --git a/src/AsyncNavigation.Avalonia.Floating/AvaloniaFloatingWindowHost.cs b/src/AsyncNavigation.Avalonia.Floating/AvaloniaFloatingWindowHost.cs
index bd31e6a..d2e7e3f 100644
--- a/src/AsyncNavigation.Avalonia.Floating/AvaloniaFloatingWindowHost.cs
+++ b/src/AsyncNavigation.Avalonia.Floating/AvaloniaFloatingWindowHost.cs
@@ -2,6 +2,7 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Layout;
 using Avalonia.Threading;
 
 namespace AsyncNavigation.Avalonia.Floating;
@@ -46,11 +47,21 @@ public AvaloniaFloatingWindowHost(FloatingWindowOptions options)
         };
         if (options.Width.HasValue) _window.Width = options.Width.Value;
         if (options.Height.HasValue) _window.Height = options.Height.Value;
-        var dockButton = new Button { Content = "Dock to region", Margin = new Thickness(8) };
-        dockButton.Click += (_, _) => RestoreRequested?.Invoke(this, EventArgs.Empty);
-        DockPanel.SetDock(dockButton, Dock.Top);
         var panel = new DockPanel { LastChildFill = true };
-        panel.Children.Add(dockButton);
+        if (options.ShowDockButton)
+        {
+            var dockButton = new Button
+            {
+                Content = "Dock to region",
+                Height = 30,
+                Margin = new Thickness(8),
+                HorizontalContentAlignment = HorizontalAlignment.Center,
+                VerticalContentAlignment = VerticalAlignment.Center
+            };
+            dockButton.Click += (_, _) => RestoreRequested?.Invoke(this, EventArgs.Empty);
+            DockPanel.SetDock(dockButton, Dock.Top);
+            panel.Children.Add(dockButton);
+        }
         panel.Children.Add(_content);
         _window.Content = panel;
         _window.Closing += OnClosing;
diff --git a/src/AsyncNavigation.Avalonia.Floating/AvaloniaOverlayFloatingWindowHost.cs b/src/AsyncNavigation.Avalonia.Floating/AvaloniaOverlayFloatingWindowHost.cs
index 2d156c1..db5c57d 100644
--- a/src/AsyncNavigation.Avalonia.Floating/AvaloniaOverlayFloatingWindowHost.cs
+++ b/src/AsyncNavigation.Avalonia.Floating/AvaloniaOverlayFloatingWindowHost.cs
@@ -50,16 +50,18 @@ public AvaloniaOverlayFloatingWindowHost(FloatingWindowOptions options, Control
             FontWeight = FontWeight.SemiBold
         };
 
-        var dockButton = new Button { Content = "Dock", Margin = new Thickness(4, 2) };
-        dockButton.Click += (_, _) => RestoreRequested?.Invoke(this, EventArgs.Empty);
-
         // A plain ASCII glyph, not "✕": the default WASM/browser font set doesn't cover it and
         // renders tofu instead.
         var closeButton = new Button { Content = "X", Margin = new Thickness(0, 2, 4, 2) };
         closeButton.Click += (_, _) => CloseRequested?.Invoke(this, EventArgs.Empty);
 
         var titleBarButtons = new StackPanel { Orientation = Orientation.Horizontal };
-        titleBarButtons.Children.Add(dockButton);
+        if (options.ShowDockButton)
+        {
+            var dockButton = new Button { Content = "Dock", Margin = new Thickness(4, 2) };
+            dockButton.Click += (_, _) => RestoreRequested?.Invoke(this, EventArgs.Empty);
+            titleBarButtons.Children.Add(dockButton);
+        }
         titleBarButtons.Children.Add(closeButton);
         Grid.SetColumn(titleBarButtons, 1);
 
diff --git a/src/AsyncNavigation.Floating/FloatingWindowOptions.cs b/src/AsyncNavigation.Floating/FloatingWindowOptions.cs
index 946d66c..956500b 100644
--- a/src/AsyncNavigation.Floating/FloatingWindowOptions.cs
+++ b/src/AsyncNavigation.Floating/FloatingWindowOptions.cs
@@ -7,11 +7,19 @@ public sealed class FloatingWindowOptions
     public double? Height { get; init; }
     public bool Topmost { get; init; }
 
+    /// <summary>
+    /// Whether the floating host should render its own "Dock to region" button.
+    /// Set this to <see langword="false"/> when the floated content provides its own
+    /// dock/restore affordance and drives it through <see cref="IFloatingViewSession.RestoreAsync"/>.
+    /// </summary>
+    public bool ShowDockButton { get; init; } = true;
+
     internal FloatingWindowOptions WithDefaultTitle(string title) => new()
     {
         Title = Title ?? title,
         Width = Width,
         Height = Height,
-        Topmost = Topmost
+        Topmost = Topmost,
+        ShowDockButton = ShowDockButton
     };
 }
diff --git a/src/AsyncNavigation.Floating/IFloatingViewSession.cs b/src/AsyncNavigation.Floating/IFloatingViewSession.cs
index 92e3ea2..4add936 100644
--- a/src/AsyncNavigation.Floating/IFloatingViewSession.cs
+++ b/src/AsyncNavigation.Floating/IFloatingViewSession.cs
@@ -6,6 +6,7 @@ public interface IFloatingViewSession
     Guid NavigationId { get; }
     string OriginRegionName { get; }
     ViewPlacementState State { get; }
+    event EventHandler? StateChanged;
     Task CloseAsync(CancellationToken cancellationToken = default);
     Task RestoreAsync(CancellationToken cancellationToken = default);
     Task ActivateAsync(CancellationToken cancellationToken = default);
diff --git a/src/AsyncNavigation.Floating/ViewPlacementService.cs b/src/AsyncNavigation.Floating/ViewPlacementService.cs
index a4fb3d2..1a583b3 100644
--- a/src/AsyncNavigation.Floating/ViewPlacementService.cs
+++ b/src/AsyncNavigation.Floating/ViewPlacementService.cs
@@ -287,7 +287,19 @@ internal FloatingViewSession(ViewPlacementService owner, Guid id, string originR
         public Guid Id { get; }
         public Guid NavigationId => Item.Context.NavigationId;
         public string OriginRegionName { get; }
-        public ViewPlacementState State { get; private set; } = ViewPlacementState.Floating;
+
+        private ViewPlacementState _state = ViewPlacementState.Floating;
+        public ViewPlacementState State
+        {
+            get => _state;
+            private set
+            {
+                if (_state == value) return;
+                _state = value;
+                StateChanged?.Invoke(this, EventArgs.Empty);
+            }
+        }
+        public event EventHandler? StateChanged;
         internal WeakReference<IRegion> OriginRegion { get; }
         internal RegionPlacementItem Item { get; }
         internal object Content { get; private set; } = null!;
diff --git a/src/AsyncNavigation.Wpf.Floating/WpfFloatingWindowHost.cs b/src/AsyncNavigation.Wpf.Floating/WpfFloatingWindowHost.cs
index 93353f6..e0558d8 100644
--- a/src/AsyncNavigation.Wpf.Floating/WpfFloatingWindowHost.cs
+++ b/src/AsyncNavigation.Wpf.Floating/WpfFloatingWindowHost.cs
@@ -36,11 +36,21 @@ public WpfFloatingWindowHost(FloatingWindowOptions options)
         };
         if (options.Width.HasValue) _window.Width = options.Width.Value;
         if (options.Height.HasValue) _window.Height = options.Height.Value;
-        var dockButton = new Button { Content = "Dock to region", Margin = new Thickness(8) };
-        dockButton.Click += (_, _) => RestoreRequested?.Invoke(this, EventArgs.Empty);
-        DockPanel.SetDock(dockButton, Dock.Top);
         var panel = new DockPanel { LastChildFill = true };
-        panel.Children.Add(dockButton);
+        if (options.ShowDockButton)
+        {
+            var dockButton = new Button
+            {
+                Content = "Dock to region",
+                Height = 30,
+                Margin = new Thickness(8),
+                HorizontalContentAlignment = HorizontalAlignment.Center,
+                VerticalContentAlignment = VerticalAlignment.Center
+            };
+            dockButton.Click += (_, _) => RestoreRequested?.Invoke(this, EventArgs.Empty);
+            DockPanel.SetDock(dockButton, Dock.Top);
+            panel.Children.Add(dockButton);
+        }
         panel.Children.Add(_content);
         _window.Content = panel;
         _window.Closing += OnClosing;
diff --git a/src/AsyncNavigation/NavigationContext.cs b/src/AsyncNavigation/NavigationContext.cs
index 6ed7e83..7f40509 100644
--- a/src/AsyncNavigation/NavigationContext.cs
+++ b/src/AsyncNavigation/NavigationContext.cs
@@ -117,7 +117,7 @@ private set
     /// <summary>
     /// Gets a unique identifier for this navigation context.
     /// </summary>
-    public Guid NavigationId { get; } = Guid.NewGuid();
+    public Guid NavigationId { get; init; } = Guid.NewGuid();
 
     /// <summary>
     /// Gets the duration of the navigation operation.
diff --git a/src/AsyncNavigation/RegionBase.cs b/src/AsyncNavigation/RegionBase.cs
index 3567b44..aab771f 100644
--- a/src/AsyncNavigation/RegionBase.cs
+++ b/src/AsyncNavigation/RegionBase.cs
@@ -175,7 +175,8 @@ public async Task RestorePlacementAsync(RegionPlacementItem item, Func<Task> tra
         {
             RegionName = Name,
             ViewName = item.Context.ViewName,
-            Parameters = item.Context.Parameters
+            Parameters = item.Context.Parameters,
+            NavigationId = item.Context.NavigationId
         };
         context.Target.Value = item.Context.Target.Value!;
         context.IndicatorHost.Value = item.Context.IndicatorHost.Value!;
diff --git a/tests/AsyncNavigation.Tests/AsyncNavigation.Tests.csproj b/tests/AsyncNavigation.Tests/AsyncNavigation.Tests.csproj
index bd352f6..5e66469 100644
--- a/tests/AsyncNavigation.Tests/AsyncNavigation.Tests.csproj
+++ b/tests/AsyncNavigation.Tests/AsyncNavigation.Tests.csproj
@@ -37,6 +37,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\AsyncNavigation\AsyncNavigation.csproj" />
     <ProjectReference Include="..\..\src\AsyncNavigation.Floating\AsyncNavigation.Floating.csproj" />
+    <ProjectReference Include="..\..\samples\Sample.Common\Sample.Common.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/AsyncNavigation.Tests/FloatingNavigationTests.cs b/tests/AsyncNavigation.Tests/FloatingNavigationTests.cs
index 11f9d2d..1a131f1 100644
--- a/tests/AsyncNavigation.Tests/FloatingNavigationTests.cs
+++ b/tests/AsyncNavigation.Tests/FloatingNavigationTests.cs
@@ -58,6 +58,24 @@ public async Task DockIntoOccupiedRegion_ReusesOriginalAndUpdatesCurrentAndHisto
         Assert.Equal(1, a.Model.FromCount);
     }
 
+    [Fact]
+    public async Task RestoredView_KeepsOriginalNavigationIdAndCanBeFloatedAgain()
+    {
+        using var f = new Fixture();
+        var a = await f.Navigate("A");
+        var navigationId = f.Region.Selected!.NavigationId;
+
+        var session = await f.Placement.FloatAsync("main", navigationId);
+        await session.RestoreAsync();
+
+        Assert.Equal(navigationId, f.Region.Selected!.NavigationId);
+
+        var secondSession = await f.Placement.FloatAsync("main", navigationId);
+
+        Assert.Equal(ViewPlacementState.Floating, secondSession.State);
+        Assert.Same(a, f.Windows[1].Content);
+    }
+
     [Theory]
     [InlineData(false)]
     [InlineData(true)]
@@ -263,8 +281,13 @@ public override Task ProcessDeactivateAsync(NavigationContext? context)
             if (context is null || ReferenceEquals(Selected, context)) Selected = null;
             return Task.CompletedTask;
         }
-        public RegionPlacementItem Capture(Guid? id = null) =>
-            new(Selected ?? throw new InvalidOperationException("empty"), 0, true);
+        public RegionPlacementItem Capture(Guid? id = null)
+        {
+            var context = Selected ?? throw new InvalidOperationException("empty");
+            if (id.HasValue && context.NavigationId != id.Value)
+                throw new InvalidOperationException($"Region '{Name}' does not contain the requested navigation item.");
+            return new(context, 0, true);
+        }
         public void Detach(RegionPlacementItem item)
         {
             Assert.Same(Selected, item.Context);
diff --git a/tests/AsyncNavigation.Tests/SampleCommonTests.cs b/tests/AsyncNavigation.Tests/SampleCommonTests.cs
new file mode 100644
index 0000000..f9e2d7f
--- /dev/null
+++ b/tests/AsyncNavigation.Tests/SampleCommonTests.cs
@@ -0,0 +1,82 @@
+using AsyncNavigation.Abstractions;
+using AsyncNavigation.Floating;
+using Moq;
+using Sample.Common;
+
+namespace AsyncNavigation.Tests;
+
+public sealed class SampleCommonTests
+{
+    [Fact]
+    public async Task SampleNavigationInterceptor_DoesNotThrow()
+    {
+        var interceptor = new SampleNavigationInterceptor();
+        var context = new NavigationContext { RegionName = "MainRegion", ViewName = "LightView" };
+
+        await interceptor.OnNavigatingAsync(context);
+        await interceptor.OnNavigatedAsync(context);
+    }
+
+    [Fact]
+    public async Task LightViewModel_CanNavigateAsync_AllowsLeavingByDefault()
+    {
+        var viewModel = new LightViewModel(Mock.Of<IRegionManager>());
+        var context = new NavigationContext { RegionName = "MainRegion", ViewName = "HeavyView" };
+
+        Assert.True(await viewModel.CanNavigateAsync(context, CancellationToken.None));
+    }
+
+    [Fact]
+    public async Task LightViewModel_CanNavigateAsync_BlocksLeavingWhenPreventLeaveIsSet()
+    {
+        var viewModel = new LightViewModel(Mock.Of<IRegionManager>())
+        {
+            PreventLeave = true
+        };
+        var context = new NavigationContext { RegionName = "MainRegion", ViewName = "HeavyView" };
+
+        Assert.False(await viewModel.CanNavigateAsync(context, CancellationToken.None));
+    }
+
+    [Fact]
+    public async Task LightViewModel_FloatThenDock_TogglesIsFloatingAndButtonText()
+    {
+        var floatingViews = new List<IFloatingViewSession>();
+        var sessionMock = new Mock<IFloatingViewSession>();
+        var context = new NavigationContext { RegionName = "MainRegion", ViewName = "LightView" };
+
+        sessionMock.SetupGet(s => s.NavigationId).Returns(context.NavigationId);
+        sessionMock.SetupGet(s => s.State).Returns(ViewPlacementState.Restored);
+        sessionMock
+            .Setup(s => s.RestoreAsync(It.IsAny<CancellationToken>()))
+            .Returns(Task.CompletedTask)
+            .Callback(() =>
+            {
+                floatingViews.Remove(sessionMock.Object);
+                sessionMock.Raise(s => s.StateChanged += null, EventArgs.Empty);
+            });
+
+        var placementService = new Mock<IViewPlacementService>();
+        placementService.Setup(p => p.FloatingViews).Returns(() => floatingViews);
+        placementService
+            .Setup(p => p.FloatAsync(It.IsAny<string>(), It.IsAny<Guid?>(), It.IsAny<FloatingWindowOptions>(), It.IsAny<CancellationToken>()))
+            .ReturnsAsync(() =>
+            {
+                floatingViews.Add(sessionMock.Object);
+                return sessionMock.Object;
+            });
+
+        var viewModel = new LightViewModel(Mock.Of<IRegionManager>(), placementService.Object);
+        await viewModel.OnNavigatedToAsync(context);
+
+        Assert.Equal("Float", viewModel.FloatButtonText);
+
+        await viewModel.FloatViewCommand.ExecuteAsync(null);
+        Assert.True(viewModel.IsFloating);
+        Assert.Equal("Dock to region", viewModel.FloatButtonText);
+
+        await viewModel.FloatViewCommand.ExecuteAsync(null);
+        Assert.False(viewModel.IsFloating);
+        Assert.Equal("Float", viewModel.FloatButtonText);
+    }
+}
diff --git a/tests/AsyncNavigation.Tests/ViewPlacementServiceTests.cs b/tests/AsyncNavigation.Tests/ViewPlacementServiceTests.cs
index ddc7086..f8b3017 100644
--- a/tests/AsyncNavigation.Tests/ViewPlacementServiceTests.cs
+++ b/tests/AsyncNavigation.Tests/ViewPlacementServiceTests.cs
@@ -32,6 +32,54 @@ public async Task FloatAndRestore_MovesTheSameRenderedHostWithoutNavigating()
         Assert.Equal(ViewPlacementState.Restored, session.State);
     }
 
+    [Fact]
+    public async Task StateChanged_ReportsEachTransitionAndStopsAfterRestored()
+    {
+        var fixture = new Fixture();
+        var session = await fixture.Service.FloatAsync("main", fixture.Context.NavigationId);
+        var states = new List<ViewPlacementState>();
+        session.StateChanged += (s, _) => states.Add(((IFloatingViewSession)s!).State);
+
+        await session.RestoreAsync();
+        Assert.Equal([ViewPlacementState.Restoring, ViewPlacementState.Restored], states);
+
+        await session.RestoreAsync();
+        Assert.Equal([ViewPlacementState.Restoring, ViewPlacementState.Restored], states);
+    }
+
+    [Fact]
+    public async Task StateChanged_ReportsEachTransitionOnClose()
+    {
+        var fixture = new Fixture();
+        var session = await fixture.Service.FloatAsync("main", fixture.Context.NavigationId);
+        var states = new List<ViewPlacementState>();
+        session.StateChanged += (s, _) => states.Add(((IFloatingViewSession)s!).State);
+
+        await session.CloseAsync();
+        Assert.Equal([ViewPlacementState.Closing, ViewPlacementState.Closed], states);
+    }
+
+    [Fact]
+    public async Task FloatAsync_DefaultOptions_ShowsDockButton()
+    {
+        var fixture = new Fixture();
+
+        await fixture.Service.FloatAsync("main", fixture.Context.NavigationId);
+
+        Assert.True(fixture.CapturedOptions!.ShowDockButton);
+    }
+
+    [Fact]
+    public async Task FloatAsync_WithShowDockButtonFalse_PassesItThroughToTheHostFactory()
+    {
+        var fixture = new Fixture();
+
+        await fixture.Service.FloatAsync("main", fixture.Context.NavigationId,
+            options: new FloatingWindowOptions { ShowDockButton = false });
+
+        Assert.False(fixture.CapturedOptions!.ShowDockButton);
+    }
+
     [Fact]
     public async Task FloatWithSameNavigationId_ActivatesExistingSession()
     {
@@ -116,7 +164,9 @@ public Fixture()
 
             Window = new FakeWindowHost();
             var factory = new Mock<IFloatingWindowHostFactory>();
-            factory.Setup(x => x.Create(It.IsAny<FloatingWindowOptions>())).Returns(Window);
+            factory.Setup(x => x.Create(It.IsAny<FloatingWindowOptions>()))
+                .Callback<FloatingWindowOptions>(o => CapturedOptions = o)
+                .Returns(Window);
 
             var provider = new ServiceCollection()
                 .AddSingleton(manager.Object)
@@ -133,6 +183,7 @@ public Fixture()
         public FakeRegion Region { get; }
         public FakeWindowHost Window { get; }
         public IViewPlacementService Service { get; }
+        public FloatingWindowOptions? CapturedOptions { get; private set; }
     }
 
     private sealed class StatefulRenderedView : IView