diff --git a/src/cascadia/TerminalControl/TermControlAutomationPeer.idl b/src/cascadia/TerminalControl/TermControlAutomationPeer.idl
index 18ada03e7bc..d979c82471f 100644
--- a/src/cascadia/TerminalControl/TermControlAutomationPeer.idl
+++ b/src/cascadia/TerminalControl/TermControlAutomationPeer.idl
@@ -5,9 +5,10 @@ import "TermControl.idl";
 
 namespace Microsoft.Terminal.TerminalControl
 {
-    [default_interface] runtimeclass TermControlAutomationPeer :
+    [default_interface]
+    runtimeclass TermControlAutomationPeer :
         Windows.UI.Xaml.Automation.Peers.FrameworkElementAutomationPeer,
         Windows.UI.Xaml.Automation.Provider.ITextProvider
-    {
-    }
+        {
+        }
 }
diff --git a/src/renderer/uia/UiaRenderer.cpp b/src/renderer/uia/UiaRenderer.cpp
index aaa4ea0c64b..555e572d74e 100644
--- a/src/renderer/uia/UiaRenderer.cpp
+++ b/src/renderer/uia/UiaRenderer.cpp
@@ -96,6 +96,8 @@ UiaEngine::~UiaEngine()
 // - S_OK
 [[nodiscard]] HRESULT UiaEngine::InvalidateSelection(const std::vector<SMALL_RECT>& rectangles) noexcept
 {
+    auto saveSelection = wil::scope_exit([&] { _prevSelection = rectangles; });
+
     // early exit: different number of rows
     if (_prevSelection.size() != rectangles.size())
     {
@@ -218,6 +220,7 @@ UiaEngine::~UiaEngine()
         if (_selectionChanged)
         {
             _dispatcher->SignalUia(ConsoleUiaEvent::SelectionChanged);
+            _selectionChanged = false;
         }
     }
 
diff --git a/src/types/lib/types.vcxproj b/src/types/lib/types.vcxproj
index 32a8362d3c5..2f0c8fb2760 100644
--- a/src/types/lib/types.vcxproj
+++ b/src/types/lib/types.vcxproj
@@ -52,4 +52,4 @@
   <!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
   <Import Project="$(SolutionDir)src\common.build.lib.props" />
   <Import Project="$(SolutionDir)src\common.build.post.props" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/types/lib/types.vcxproj.filters b/src/types/lib/types.vcxproj.filters
index 269da94b2f8..1aec13210de 100644
--- a/src/types/lib/types.vcxproj.filters
+++ b/src/types/lib/types.vcxproj.filters
@@ -159,4 +159,4 @@
   <ItemGroup>
     <Natvis Include="$(SolutionDir)tools\ConsoleTypes.natvis" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>