diff --git a/src/cascadia/TerminalSettingsEditor/Actions.h b/src/cascadia/TerminalSettingsEditor/Actions.h
index 9c4d37cf6..97ae3d58b 100644
--- a/src/cascadia/TerminalSettingsEditor/Actions.h
+++ b/src/cascadia/TerminalSettingsEditor/Actions.h
@@ -107,7 +107,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         WINRT_PROPERTY(Model::CascadiaSettings, Settings, nullptr)
     };
 
-    struct Actions : ActionsT<Actions>
+    struct Actions : public HasScrollViewer<Actions>, ActionsT<Actions>
     {
     public:
         Actions();
diff --git a/src/cascadia/TerminalSettingsEditor/Actions.xaml b/src/cascadia/TerminalSettingsEditor/Actions.xaml
index 11c1f65e4..35a59cc8f 100644
--- a/src/cascadia/TerminalSettingsEditor/Actions.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Actions.xaml
@@ -374,7 +374,7 @@
         </ResourceDictionary>
     </Page.Resources>
 
-    <ScrollViewer>
+    <ScrollViewer ViewChanging="ViewChanging">
         <StackPanel MaxWidth="600"
                     Spacing="8"
                     Style="{StaticResource SettingsStackStyle}">
diff --git a/src/cascadia/TerminalSettingsEditor/AddProfile.h b/src/cascadia/TerminalSettingsEditor/AddProfile.h
index 39b78ffe9..5eaedbbad 100644
--- a/src/cascadia/TerminalSettingsEditor/AddProfile.h
+++ b/src/cascadia/TerminalSettingsEditor/AddProfile.h
@@ -43,7 +43,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         WINRT_CALLBACK(AddNew, AddNewArgs);
     };
 
-    struct AddProfile : AddProfileT<AddProfile>
+    struct AddProfile : public HasScrollViewer<AddProfile>, AddProfileT<AddProfile>
     {
     public:
         AddProfile();
diff --git a/src/cascadia/TerminalSettingsEditor/AddProfile.xaml b/src/cascadia/TerminalSettingsEditor/AddProfile.xaml
index 5cff69b87..6229512c6 100644
--- a/src/cascadia/TerminalSettingsEditor/AddProfile.xaml
+++ b/src/cascadia/TerminalSettingsEditor/AddProfile.xaml
@@ -21,7 +21,7 @@
         </ResourceDictionary>
     </Page.Resources>
 
-    <ScrollViewer>
+    <ScrollViewer ViewChanging="ViewChanging">
         <StackPanel Style="{StaticResource SettingsStackStyle}">
             <Button x:Uid="AddProfile_AddNewButton"
                     AutomationProperties.AutomationId="AddProfile_AddNewButton"
diff --git a/src/cascadia/TerminalSettingsEditor/ColorSchemes.h b/src/cascadia/TerminalSettingsEditor/ColorSchemes.h
index 23da46f5f..8a7b150d0 100644
--- a/src/cascadia/TerminalSettingsEditor/ColorSchemes.h
+++ b/src/cascadia/TerminalSettingsEditor/ColorSchemes.h
@@ -20,7 +20,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         WINRT_PROPERTY(winrt::hstring, LastSelectedScheme, L"");
     };
 
-    struct ColorSchemes : ColorSchemesT<ColorSchemes>
+    struct ColorSchemes : public HasScrollViewer<ColorSchemes>, ColorSchemesT<ColorSchemes>
     {
         ColorSchemes();
 
diff --git a/src/cascadia/TerminalSettingsEditor/ColorSchemes.xaml b/src/cascadia/TerminalSettingsEditor/ColorSchemes.xaml
index 0e0419f33..4629cad1e 100644
--- a/src/cascadia/TerminalSettingsEditor/ColorSchemes.xaml
+++ b/src/cascadia/TerminalSettingsEditor/ColorSchemes.xaml
@@ -93,7 +93,7 @@
         </ResourceDictionary>
     </Page.Resources>
 
-    <ScrollViewer>
+    <ScrollViewer ViewChanging="ViewChanging">
         <StackPanel Margin="{StaticResource StandardIndentMargin}"
                     Spacing="24">
 
diff --git a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.h b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.h
index c46053953..c566b953a 100644
--- a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.h
+++ b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.h
@@ -18,7 +18,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         WINRT_PROPERTY(Model::GlobalAppSettings, Globals, nullptr)
     };
 
-    struct GlobalAppearance : GlobalAppearanceT<GlobalAppearance>
+    struct GlobalAppearance : public HasScrollViewer<GlobalAppearance>, GlobalAppearanceT<GlobalAppearance>
     {
     public:
         GlobalAppearance();
diff --git a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml
index c4f4bf2b4..ecac82483 100644
--- a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml
+++ b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml
@@ -24,7 +24,7 @@
         </ResourceDictionary>
     </Page.Resources>
 
-    <ScrollViewer>
+    <ScrollViewer ViewChanging="ViewChanging">
         <StackPanel Style="{StaticResource SettingsStackStyle}">
             <!--  Language  -->
             <local:SettingContainer x:Uid="Globals_Language"
diff --git a/src/cascadia/TerminalSettingsEditor/Interaction.h b/src/cascadia/TerminalSettingsEditor/Interaction.h
index ac93655de..bf6dc598b 100644
--- a/src/cascadia/TerminalSettingsEditor/Interaction.h
+++ b/src/cascadia/TerminalSettingsEditor/Interaction.h
@@ -18,7 +18,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         WINRT_PROPERTY(Model::GlobalAppSettings, Globals, nullptr)
     };
 
-    struct Interaction : InteractionT<Interaction>
+    struct Interaction : public HasScrollViewer<Interaction>, InteractionT<Interaction>
     {
         Interaction();
 
diff --git a/src/cascadia/TerminalSettingsEditor/Interaction.xaml b/src/cascadia/TerminalSettingsEditor/Interaction.xaml
index 35af1fbfc..72f8d21c2 100644
--- a/src/cascadia/TerminalSettingsEditor/Interaction.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Interaction.xaml
@@ -24,7 +24,7 @@
         </ResourceDictionary>
     </Page.Resources>
 
-    <ScrollViewer>
+    <ScrollViewer ViewChanging="ViewChanging">
         <StackPanel Style="{StaticResource SettingsStackStyle}">
             <!--  Copy On Select  -->
             <local:SettingContainer x:Uid="Globals_CopyOnSelect"
diff --git a/src/cascadia/TerminalSettingsEditor/Launch.h b/src/cascadia/TerminalSettingsEditor/Launch.h
index 8219939e0..799a4fc32 100644
--- a/src/cascadia/TerminalSettingsEditor/Launch.h
+++ b/src/cascadia/TerminalSettingsEditor/Launch.h
@@ -18,7 +18,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         WINRT_PROPERTY(Model::CascadiaSettings, Settings, nullptr)
     };
 
-    struct Launch : LaunchT<Launch>
+    struct Launch : public HasScrollViewer<Launch>, LaunchT<Launch>
     {
     public:
         Launch();
diff --git a/src/cascadia/TerminalSettingsEditor/Launch.xaml b/src/cascadia/TerminalSettingsEditor/Launch.xaml
index e342369ba..b556a4889 100644
--- a/src/cascadia/TerminalSettingsEditor/Launch.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Launch.xaml
@@ -33,7 +33,7 @@
         </ResourceDictionary>
     </Page.Resources>
 
-    <ScrollViewer>
+    <ScrollViewer ViewChanging="ViewChanging">
         <StackPanel>
             <StackPanel Style="{StaticResource SettingsStackStyle}">
                 <!--  Default Profile  -->
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles.h b/src/cascadia/TerminalSettingsEditor/Profiles.h
index 65a151cb0..e1ceba5d0 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles.h
+++ b/src/cascadia/TerminalSettingsEditor/Profiles.h
@@ -153,7 +153,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         Windows::Foundation::Collections::IMapView<hstring, Model::ColorScheme> _Schemes;
     };
 
-    struct Profiles : ProfilesT<Profiles>
+    struct Profiles : public HasScrollViewer<Profiles>, ProfilesT<Profiles>
     {
     public:
         Profiles();
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles.xaml b/src/cascadia/TerminalSettingsEditor/Profiles.xaml
index 763532256..54afd38fd 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Profiles.xaml
@@ -56,7 +56,7 @@
                SelectionChanged="Pivot_SelectionChanged">
             <!--  General Tab  -->
             <PivotItem x:Uid="Profile_General">
-                <ScrollViewer>
+                <ScrollViewer ViewChanging="ViewChanging">
                     <StackPanel Style="{StaticResource PivotStackStyle}">
 
                         <!--  Name  -->
@@ -225,7 +225,7 @@
 
             <!--  Appearance Tab  -->
             <PivotItem x:Uid="Profile_Appearance">
-                <ScrollViewer>
+                <ScrollViewer ViewChanging="ViewChanging">
                     <StackPanel>
                         <!--  Control Preview  -->
                         <Border x:Name="ControlPreview"
@@ -397,7 +397,7 @@
 
             <!--  Advanced Tab  -->
             <PivotItem x:Uid="Profile_Advanced">
-                <ScrollViewer>
+                <ScrollViewer ViewChanging="ViewChanging">
                     <StackPanel Style="{StaticResource PivotStackStyle}">
                         <!--  Suppress Application Title  -->
                         <local:SettingContainer x:Uid="Profile_SuppressApplicationTitle"
diff --git a/src/cascadia/TerminalSettingsEditor/ReadOnlyActions.h b/src/cascadia/TerminalSettingsEditor/ReadOnlyActions.h
index 786dabf8c..274fcb164 100644
--- a/src/cascadia/TerminalSettingsEditor/ReadOnlyActions.h
+++ b/src/cascadia/TerminalSettingsEditor/ReadOnlyActions.h
@@ -32,7 +32,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         TYPED_EVENT(OpenJson, Windows::Foundation::IInspectable, Model::SettingsTarget);
     };
 
-    struct ReadOnlyActions : ReadOnlyActionsT<ReadOnlyActions>
+    struct ReadOnlyActions : public HasScrollViewer<ReadOnlyActions>, ReadOnlyActionsT<ReadOnlyActions>
     {
     public:
         ReadOnlyActions();
diff --git a/src/cascadia/TerminalSettingsEditor/ReadOnlyActions.xaml b/src/cascadia/TerminalSettingsEditor/ReadOnlyActions.xaml
index eef40cd8d..c5c1844cc 100644
--- a/src/cascadia/TerminalSettingsEditor/ReadOnlyActions.xaml
+++ b/src/cascadia/TerminalSettingsEditor/ReadOnlyActions.xaml
@@ -182,7 +182,7 @@
         </ResourceDictionary>
     </Page.Resources>
 
-    <ScrollViewer>
+    <ScrollViewer ViewChanging="ViewChanging">
         <StackPanel Style="{StaticResource SettingsStackStyle}">
             <TextBlock x:Uid="Globals_KeybindingsDisclaimer"
                        Style="{StaticResource DisclaimerStyle}" />
diff --git a/src/cascadia/TerminalSettingsEditor/Rendering.h b/src/cascadia/TerminalSettingsEditor/Rendering.h
index f6a961405..1566e04ee 100644
--- a/src/cascadia/TerminalSettingsEditor/Rendering.h
+++ b/src/cascadia/TerminalSettingsEditor/Rendering.h
@@ -18,7 +18,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         WINRT_PROPERTY(Model::GlobalAppSettings, Globals, nullptr)
     };
 
-    struct Rendering : RenderingT<Rendering>
+    struct Rendering : public HasScrollViewer<Rendering>, RenderingT<Rendering>
     {
         Rendering();
 
diff --git a/src/cascadia/TerminalSettingsEditor/Rendering.xaml b/src/cascadia/TerminalSettingsEditor/Rendering.xaml
index cd6da7ca6..3746a444c 100644
--- a/src/cascadia/TerminalSettingsEditor/Rendering.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Rendering.xaml
@@ -18,7 +18,7 @@
         </ResourceDictionary>
     </Page.Resources>
 
-    <ScrollViewer>
+    <ScrollViewer ViewChanging="ViewChanging">
         <StackPanel Style="{StaticResource SettingsStackStyle}">
             <TextBlock x:Uid="Globals_RenderingDisclaimer"
                        Style="{StaticResource DisclaimerStyle}" />
diff --git a/src/cascadia/TerminalSettingsEditor/Utils.h b/src/cascadia/TerminalSettingsEditor/Utils.h
index 763c9511b..d0eddf025 100644
--- a/src/cascadia/TerminalSettingsEditor/Utils.h
+++ b/src/cascadia/TerminalSettingsEditor/Utils.h
@@ -138,3 +138,41 @@ namespace winrt::Microsoft::Terminal::Settings
     winrt::hstring GetSelectedItemTag(winrt::Windows::Foundation::IInspectable const& comboBoxAsInspectable);
     winrt::hstring LocalizedNameForEnumName(const std::wstring_view sectionAndType, const std::wstring_view enumValue, const std::wstring_view propertyType);
 }
+
+// BODGY!
+//
+// The following function and struct are a workaround for GH#9320.
+//
+// DismissAllPopups can be used to dismiss all popups for a particular UI
+// element. However, we've got a bunch of pages with scroll viewers that may or
+// may not have popups in them. Rather than define the same exact body for all
+// their ViewChanging events, the HasScrollViewer struct will just do it for
+// you!
+inline void DismissAllPopups(winrt::Windows::UI::Xaml::XamlRoot const& xamlRoot)
+{
+    const auto popups{ winrt::Windows::UI::Xaml::Media::VisualTreeHelper::GetOpenPopupsForXamlRoot(xamlRoot) };
+    for (const auto& p : popups)
+    {
+        p.IsOpen(false);
+    }
+}
+
+template<typename T>
+struct HasScrollViewer
+{
+    // When the ScrollViewer scrolls, dismiss any popups we might have.
+    void ViewChanging(winrt::Windows::Foundation::IInspectable const& sender,
+                      const winrt::Windows::UI::Xaml::Controls::ScrollViewerViewChangingEventArgs& /*e*/)
+    {
+        // Inside this struct, we can't get at the XamlRoot() that our subclass
+        // implements. I mean, _we_ can, but when XAML does it's code
+        // generation, _XAML_ won't be able to figure it out.
+        //
+        // Fortunately for us, we don't need to! The sender is a UIElement, so
+        // we can just get _their_ XamlRoot().
+        if (const auto& uielem{ sender.try_as<winrt::Windows::UI::Xaml::UIElement>() })
+        {
+            DismissAllPopups(uielem.XamlRoot());
+        }
+    }
+};
diff --git a/src/cascadia/WindowsTerminal/AppHost.cpp b/src/cascadia/WindowsTerminal/AppHost.cpp
index 356d1d5c4..8c5547493 100644
--- a/src/cascadia/WindowsTerminal/AppHost.cpp
+++ b/src/cascadia/WindowsTerminal/AppHost.cpp
@@ -79,6 +79,7 @@ AppHost::AppHost() noexcept :
                                                 std::placeholders::_2));
     _window->MouseScrolled({ this, &AppHost::_WindowMouseWheeled });
     _window->WindowActivated({ this, &AppHost::_WindowActivated });
+    _window->WindowMoved({ this, &AppHost::_WindowMoved });
     _window->HotkeyPressed({ this, &AppHost::_GlobalHotkeyPressed });
     _window->SetAlwaysOnTop(_logic.GetInitialAlwaysOnTop());
     _window->MakeWindow();
@@ -1095,3 +1096,29 @@ winrt::fire_and_forget AppHost::_HideTrayIconRequested()
         }
     }
 }
+
+// Method Description:
+// - BODGY workaround for GH#9320. When the window moves, dismiss all the popups
+//   in the UI tree. Xaml Islands unfortunately doesn't do this for us, see
+//   microsoft/microsoft-ui-xaml#4554
+// Arguments:
+// - <none>
+// Return Value:
+// - <none>
+void AppHost::_WindowMoved()
+{
+    if (_logic)
+    {
+        const auto root{ _logic.GetRoot() };
+
+        // This is basically DismissAllPopups which is also in
+        // TerminalSettingsEditor/Utils.h
+        // There isn't a good place that's shared between these two files, but
+        // it's only 5 LOC so whatever.
+        const auto popups{ Media::VisualTreeHelper::GetOpenPopupsForXamlRoot(root.XamlRoot()) };
+        for (const auto& p : popups)
+        {
+            p.IsOpen(false);
+        }
+    }
+}
diff --git a/src/cascadia/WindowsTerminal/AppHost.h b/src/cascadia/WindowsTerminal/AppHost.h
index 89a4c96d9..06c4bb50e 100644
--- a/src/cascadia/WindowsTerminal/AppHost.h
+++ b/src/cascadia/WindowsTerminal/AppHost.h
@@ -48,6 +48,7 @@ private:
                           const winrt::Windows::Foundation::IInspectable& arg);
     void _WindowMouseWheeled(const til::point coord, const int32_t delta);
     winrt::fire_and_forget _WindowActivated();
+    void _WindowMoved();
 
     void _DispatchCommandline(winrt::Windows::Foundation::IInspectable sender,
                               winrt::Microsoft::Terminal::Remoting::CommandlineArgs args);
diff --git a/src/cascadia/WindowsTerminal/IslandWindow.cpp b/src/cascadia/WindowsTerminal/IslandWindow.cpp
index 616f80036..ac281880c 100644
--- a/src/cascadia/WindowsTerminal/IslandWindow.cpp
+++ b/src/cascadia/WindowsTerminal/IslandWindow.cpp
@@ -465,6 +465,11 @@ long IslandWindow::_calculateTotalSize(const bool isWidth, const long clientSize
     {
         return _OnMoving(wparam, lparam);
     }
+    case WM_MOVE:
+    {
+        _WindowMovedHandlers();
+        break;
+    }
     case WM_CLOSE:
     {
         // If the user wants to close the app by clicking 'X' button,
diff --git a/src/cascadia/WindowsTerminal/IslandWindow.h b/src/cascadia/WindowsTerminal/IslandWindow.h
index 1f78c8e1a..773119329 100644
--- a/src/cascadia/WindowsTerminal/IslandWindow.h
+++ b/src/cascadia/WindowsTerminal/IslandWindow.h
@@ -1,135 +1,138 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-#include "BaseWindow.h"
-#include <winrt/TerminalApp.h>
-#include "../../cascadia/inc/cppwinrt_utils.h"
-
-class IslandWindow :
-    public BaseWindow<IslandWindow>
-{
-public:
-    IslandWindow() noexcept;
-    virtual ~IslandWindow() override;
-
-    virtual void MakeWindow() noexcept;
-    void Close();
-    virtual void OnSize(const UINT width, const UINT height);
-
-    [[nodiscard]] virtual LRESULT MessageHandler(UINT const message, WPARAM const wparam, LPARAM const lparam) noexcept override;
-    void OnResize(const UINT width, const UINT height) override;
-    void OnMinimize() override;
-    void OnRestore() override;
-    virtual void OnAppInitialized();
-    virtual void SetContent(winrt::Windows::UI::Xaml::UIElement content);
-    virtual void OnApplicationThemeChanged(const winrt::Windows::UI::Xaml::ElementTheme& requestedTheme);
-    virtual RECT GetNonClientFrame(const UINT dpi) const noexcept;
-    virtual SIZE GetTotalNonClientExclusiveSize(const UINT dpi) const noexcept;
-
-    virtual void Initialize();
-
-    void SetCreateCallback(std::function<void(const HWND, const RECT, winrt::Microsoft::Terminal::Settings::Model::LaunchMode& launchMode)> pfn) noexcept;
-    void SetSnapDimensionCallback(std::function<float(bool widthOrHeight, float dimension)> pfn) noexcept;
-
-    void FocusModeChanged(const bool focusMode);
-    void FullscreenChanged(const bool fullscreen);
-    void SetAlwaysOnTop(const bool alwaysOnTop);
-
-    void FlashTaskbar();
-    void SetTaskbarProgress(const size_t state, const size_t progress);
-
-    void UnregisterHotKey(const int index) noexcept;
-    bool RegisterHotKey(const int index, const winrt::Microsoft::Terminal::Control::KeyChord& hotkey) noexcept;
-
-    winrt::fire_and_forget SummonWindow(winrt::Microsoft::Terminal::Remoting::SummonWindowBehavior args);
-
-    bool IsQuakeWindow() const noexcept;
-    void IsQuakeWindow(bool isQuakeWindow) noexcept;
-
-    void HideWindow();
-
-    void SetMinimizeToTrayBehavior(bool minimizeToTray) noexcept;
-
-    DECLARE_EVENT(DragRegionClicked, _DragRegionClickedHandlers, winrt::delegate<>);
-    DECLARE_EVENT(WindowCloseButtonClicked, _windowCloseButtonClickedHandler, winrt::delegate<>);
-    WINRT_CALLBACK(MouseScrolled, winrt::delegate<void(til::point, int32_t)>);
-    WINRT_CALLBACK(WindowActivated, winrt::delegate<void()>);
-    WINRT_CALLBACK(HotkeyPressed, winrt::delegate<void(long)>);
-    WINRT_CALLBACK(NotifyTrayIconPressed, winrt::delegate<void()>);
-    WINRT_CALLBACK(NotifyShowTrayContextMenu, winrt::delegate<void(til::point)>);
-    WINRT_CALLBACK(NotifyTrayMenuItemSelected, winrt::delegate<void(HMENU, UINT)>);
-    WINRT_CALLBACK(NotifyReAddTrayIcon, winrt::delegate<void()>);
-
-protected:
-    void ForceResize()
-    {
-        // Do a quick resize to force the island to paint
-        const auto size = GetPhysicalSize();
-        OnSize(size.cx, size.cy);
-    }
-
-    HWND _interopWindowHandle;
-
-    winrt::Windows::UI::Xaml::Hosting::DesktopWindowXamlSource _source;
-    winrt::Windows::UI::Xaml::Controls::Grid _rootGrid;
-    wil::com_ptr<ITaskbarList3> _taskbar;
-
-    std::function<void(const HWND, const RECT, winrt::Microsoft::Terminal::Settings::Model::LaunchMode& launchMode)> _pfnCreateCallback;
-    std::function<float(bool, float)> _pfnSnapDimensionCallback;
-
-    void _HandleCreateWindow(const WPARAM wParam, const LPARAM lParam) noexcept;
-    [[nodiscard]] LRESULT _OnSizing(const WPARAM wParam, const LPARAM lParam);
-    [[nodiscard]] LRESULT _OnMoving(const WPARAM wParam, const LPARAM lParam);
-
-    bool _borderless{ false };
-    bool _alwaysOnTop{ false };
-    bool _fullscreen{ false };
-    bool _fWasMaximizedBeforeFullscreen{ false };
-    RECT _rcWindowBeforeFullscreen{};
-    RECT _rcWorkBeforeFullscreen{};
-    UINT _dpiBeforeFullscreen{ 96 };
-
-    virtual void _SetIsBorderless(const bool borderlessEnabled);
-    virtual void _SetIsFullscreen(const bool fullscreenEnabled);
-    void _RestoreFullscreenPosition(const RECT rcWork);
-    void _SetFullscreenPosition(const RECT rcMonitor, const RECT rcWork);
-
-    LONG _getDesiredWindowStyle() const;
-
-    void _OnGetMinMaxInfo(const WPARAM wParam, const LPARAM lParam);
-    long _calculateTotalSize(const bool isWidth, const long clientSize, const long nonClientSize);
-
-    void _globalActivateWindow(const uint32_t dropdownDuration,
-                               const winrt::Microsoft::Terminal::Remoting::MonitorBehavior toMonitor);
-    void _dropdownWindow(const uint32_t dropdownDuration,
-                         const winrt::Microsoft::Terminal::Remoting::MonitorBehavior toMonitor);
-    void _slideUpWindow(const uint32_t dropdownDuration);
-    void _doSlideAnimation(const uint32_t dropdownDuration, const bool down);
-    void _globalDismissWindow(const uint32_t dropdownDuration);
-
-    static MONITORINFO _getMonitorForCursor();
-    static MONITORINFO _getMonitorForWindow(HWND foregroundWindow);
-    void _moveToMonitor(HWND foregroundWindow, const winrt::Microsoft::Terminal::Remoting::MonitorBehavior toMonitor);
-    void _moveToMonitorOfMouse();
-    void _moveToMonitorOf(HWND foregroundWindow);
-    void _moveToMonitor(const MONITORINFO activeMonitor);
-
-    bool _isQuakeWindow{ false };
-
-    void _enterQuakeMode();
-    til::rectangle _getQuakeModeSize(HMONITOR hmon);
-
-    void _summonWindowRoutineBody(winrt::Microsoft::Terminal::Remoting::SummonWindowBehavior args);
-
-    bool _minimizeToTray{ false };
-
-private:
-    // This minimum width allows for width the tabs fit
-    static constexpr long minimumWidth = 460L;
-
-    // We run with no height requirement for client area,
-    // though the total height will take into account the non-client area
-    // and the requirements of components hosted in the client area
-    static constexpr long minimumHeight = 0L;
-};
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "pch.h"
+#include "BaseWindow.h"
+#include <winrt/TerminalApp.h>
+#include "../../cascadia/inc/cppwinrt_utils.h"
+
+class IslandWindow :
+    public BaseWindow<IslandWindow>
+{
+public:
+    IslandWindow() noexcept;
+    virtual ~IslandWindow() override;
+
+    virtual void MakeWindow() noexcept;
+    void Close();
+    virtual void OnSize(const UINT width, const UINT height);
+
+    [[nodiscard]] virtual LRESULT MessageHandler(UINT const message, WPARAM const wparam, LPARAM const lparam) noexcept override;
+    void OnResize(const UINT width, const UINT height) override;
+    void OnMinimize() override;
+    void OnRestore() override;
+    virtual void OnAppInitialized();
+    virtual void SetContent(winrt::Windows::UI::Xaml::UIElement content);
+    virtual void OnApplicationThemeChanged(const winrt::Windows::UI::Xaml::ElementTheme& requestedTheme);
+    virtual RECT GetNonClientFrame(const UINT dpi) const noexcept;
+    virtual SIZE GetTotalNonClientExclusiveSize(const UINT dpi) const noexcept;
+
+    virtual void Initialize();
+
+    void SetCreateCallback(std::function<void(const HWND, const RECT, winrt::Microsoft::Terminal::Settings::Model::LaunchMode& launchMode)> pfn) noexcept;
+    void SetSnapDimensionCallback(std::function<float(bool widthOrHeight, float dimension)> pfn) noexcept;
+
+    void FocusModeChanged(const bool focusMode);
+    void FullscreenChanged(const bool fullscreen);
+    void SetAlwaysOnTop(const bool alwaysOnTop);
+
+    void FlashTaskbar();
+    void SetTaskbarProgress(const size_t state, const size_t progress);
+
+    void UnregisterHotKey(const int index) noexcept;
+    bool RegisterHotKey(const int index, const winrt::Microsoft::Terminal::Control::KeyChord& hotkey) noexcept;
+
+    winrt::fire_and_forget SummonWindow(winrt::Microsoft::Terminal::Remoting::SummonWindowBehavior args);
+
+    bool IsQuakeWindow() const noexcept;
+    void IsQuakeWindow(bool isQuakeWindow) noexcept;
+
+    void HideWindow();
+
+    void SetMinimizeToTrayBehavior(bool minimizeToTray) noexcept;
+
+    DECLARE_EVENT(DragRegionClicked, _DragRegionClickedHandlers, winrt::delegate<>);
+    DECLARE_EVENT(WindowCloseButtonClicked, _windowCloseButtonClickedHandler, winrt::delegate<>);
+    WINRT_CALLBACK(MouseScrolled, winrt::delegate<void(til::point, int32_t)>);
+    WINRT_CALLBACK(WindowActivated, winrt::delegate<void()>);
+    WINRT_CALLBACK(HotkeyPressed, winrt::delegate<void(long)>);
+    WINRT_CALLBACK(NotifyTrayIconPressed, winrt::delegate<void()>);
+    WINRT_CALLBACK(NotifyWindowHidden, winrt::delegate<void()>);
+    WINRT_CALLBACK(NotifyShowTrayContextMenu, winrt::delegate<void(til::point)>);
+    WINRT_CALLBACK(NotifyTrayMenuItemSelected, winrt::delegate<void(HMENU, UINT)>);
+    WINRT_CALLBACK(NotifyReAddTrayIcon, winrt::delegate<void()>);
+
+    WINRT_CALLBACK(WindowMoved, winrt::delegate<void()>);
+
+protected:
+    void ForceResize()
+    {
+        // Do a quick resize to force the island to paint
+        const auto size = GetPhysicalSize();
+        OnSize(size.cx, size.cy);
+    }
+
+    HWND _interopWindowHandle;
+
+    winrt::Windows::UI::Xaml::Hosting::DesktopWindowXamlSource _source;
+    winrt::Windows::UI::Xaml::Controls::Grid _rootGrid;
+    wil::com_ptr<ITaskbarList3> _taskbar;
+
+    std::function<void(const HWND, const RECT, winrt::Microsoft::Terminal::Settings::Model::LaunchMode& launchMode)> _pfnCreateCallback;
+    std::function<float(bool, float)> _pfnSnapDimensionCallback;
+
+    void _HandleCreateWindow(const WPARAM wParam, const LPARAM lParam) noexcept;
+    [[nodiscard]] LRESULT _OnSizing(const WPARAM wParam, const LPARAM lParam);
+    [[nodiscard]] LRESULT _OnMoving(const WPARAM wParam, const LPARAM lParam);
+
+    bool _borderless{ false };
+    bool _alwaysOnTop{ false };
+    bool _fullscreen{ false };
+    bool _fWasMaximizedBeforeFullscreen{ false };
+    RECT _rcWindowBeforeFullscreen{};
+    RECT _rcWorkBeforeFullscreen{};
+    UINT _dpiBeforeFullscreen{ 96 };
+
+    virtual void _SetIsBorderless(const bool borderlessEnabled);
+    virtual void _SetIsFullscreen(const bool fullscreenEnabled);
+    void _RestoreFullscreenPosition(const RECT rcWork);
+    void _SetFullscreenPosition(const RECT rcMonitor, const RECT rcWork);
+
+    LONG _getDesiredWindowStyle() const;
+
+    void _OnGetMinMaxInfo(const WPARAM wParam, const LPARAM lParam);
+    long _calculateTotalSize(const bool isWidth, const long clientSize, const long nonClientSize);
+
+    void _globalActivateWindow(const uint32_t dropdownDuration,
+                               const winrt::Microsoft::Terminal::Remoting::MonitorBehavior toMonitor);
+    void _dropdownWindow(const uint32_t dropdownDuration,
+                         const winrt::Microsoft::Terminal::Remoting::MonitorBehavior toMonitor);
+    void _slideUpWindow(const uint32_t dropdownDuration);
+    void _doSlideAnimation(const uint32_t dropdownDuration, const bool down);
+    void _globalDismissWindow(const uint32_t dropdownDuration);
+
+    static MONITORINFO _getMonitorForCursor();
+    static MONITORINFO _getMonitorForWindow(HWND foregroundWindow);
+    void _moveToMonitor(HWND foregroundWindow, const winrt::Microsoft::Terminal::Remoting::MonitorBehavior toMonitor);
+    void _moveToMonitorOfMouse();
+    void _moveToMonitorOf(HWND foregroundWindow);
+    void _moveToMonitor(const MONITORINFO activeMonitor);
+
+    bool _isQuakeWindow{ false };
+
+    void _enterQuakeMode();
+    til::rectangle _getQuakeModeSize(HMONITOR hmon);
+
+    void _summonWindowRoutineBody(winrt::Microsoft::Terminal::Remoting::SummonWindowBehavior args);
+
+    bool _minimizeToTray{ false };
+
+private:
+    // This minimum width allows for width the tabs fit
+    static constexpr long minimumWidth = 460L;
+
+    // We run with no height requirement for client area,
+    // though the total height will take into account the non-client area
+    // and the requirements of components hosted in the client area
+    static constexpr long minimumHeight = 0L;
+};
diff --git a/src/cascadia/WindowsTerminal/pch.h b/src/cascadia/WindowsTerminal/pch.h
index ce71201a4..01d2f04a7 100644
--- a/src/cascadia/WindowsTerminal/pch.h
+++ b/src/cascadia/WindowsTerminal/pch.h
@@ -60,8 +60,10 @@ Abstract:
 //  * Controls for grid
 //  * Media for ScaleTransform
 //  * ApplicationModel for finding the path to wt.exe
+//  * Primitives for Popup (used by GetOpenPopupsForXamlRoot)
 #include <winrt/Windows.UI.Core.h>
 #include <winrt/Windows.UI.Xaml.Controls.h>
+#include <winrt/Windows.UI.Xaml.Controls.Primitives.h>
 #include <winrt/Windows.ui.xaml.media.h>
 #include <winrt/Windows.ApplicationModel.h>
 #include <winrt/Windows.ApplicationModel.Resources.Core.h>