diff --git a/src/cascadia/TerminalSettingsEditor/Actions.cpp b/src/cascadia/TerminalSettingsEditor/Actions.cpp
index ffd2ae343c8..4f65c8cba8e 100644
--- a/src/cascadia/TerminalSettingsEditor/Actions.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Actions.cpp
@@ -25,8 +25,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         KeyBindingViewModel(nullptr, availableActions.First().Current(), availableActions) {}
 
     KeyBindingViewModel::KeyBindingViewModel(const Control::KeyChord& keys, const hstring& actionName, const IObservableVector<hstring>& availableActions) :
-        _Keys{ keys },
-        _KeyChordText{ Model::KeyChordSerialization::ToString(keys) },
+        _CurrentKeys{ keys },
+        _KeyChordText{ KeyChordSerialization::ToString(keys) },
         _CurrentAction{ actionName },
         _ProposedAction{ box_value(actionName) },
         _AvailableActions{ availableActions }
@@ -36,9 +36,9 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         //  unique view model members.
         PropertyChanged([this](auto&&, const PropertyChangedEventArgs& args) {
             const auto viewModelProperty{ args.PropertyName() };
-            if (viewModelProperty == L"Keys")
+            if (viewModelProperty == L"CurrentKeys")
             {
-                _KeyChordText = Model::KeyChordSerialization::ToString(_Keys);
+                _KeyChordText = KeyChordSerialization::ToString(_CurrentKeys);
                 _NotifyChanges(L"KeyChordText");
             }
             else if (viewModelProperty == L"IsContainerFocused" ||
@@ -75,8 +75,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             // if we're in edit mode,
             // - pre-populate the text box with the current keys
             // - reset the combo box with the current action
-            ProposedKeys(KeyChordText());
-            ProposedAction(box_value(CurrentAction()));
+            ProposedKeys(_CurrentKeys);
+            ProposedAction(box_value(_CurrentAction));
         }
     }
 
@@ -85,35 +85,13 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         AttemptAcceptChanges(_ProposedKeys);
     }
 
-    void KeyBindingViewModel::AttemptAcceptChanges(hstring newKeyChordText)
+    void KeyBindingViewModel::AttemptAcceptChanges(const Control::KeyChord newKeys)
     {
-        try
-        {
-            // empty string --> don't accept changes
-            if (newKeyChordText.empty())
-            {
-                return;
-            }
-
-            // ModifyKeyBindingEventArgs
-            const auto args{ make_self<ModifyKeyBindingEventArgs>(_Keys, // OldKeys
-                                                                  KeyChordSerialization::FromString(newKeyChordText), // NewKeys: Attempt to convert the provided key chord text
-                                                                  _IsNewlyAdded ? hstring{} : _CurrentAction, // OldAction
-                                                                  unbox_value<hstring>(_ProposedAction)) }; //
-            _ModifyKeyBindingRequestedHandlers(*this, *args);
-        }
-        catch (hresult_invalid_argument)
-        {
-            // Converting the text into a key chord failed.
-            // Don't accept the changes.
-            // TODO GH #6900:
-            //  This is tricky. I still haven't found a way to reference the
-            //  key chord text box. It's hidden behind the data template.
-            //  Ideally, some kind of notification would alert the user, but
-            //  to make it look nice, we need it to somehow target the text box.
-            //  Alternatively, we want a full key chord editor/listener.
-            //  If we implement that, we won't need this validation or error message.
-        }
+        const auto args{ make_self<ModifyKeyBindingEventArgs>(_CurrentKeys, // OldKeys
+                                                              newKeys, // NewKeys
+                                                              _IsNewlyAdded ? hstring{} : _CurrentAction, // OldAction
+                                                              unbox_value<hstring>(_ProposedAction)) }; // NewAction
+        _ModifyKeyBindingRequestedHandlers(*this, *args);
     }
 
     void KeyBindingViewModel::CancelChanges()
@@ -179,34 +157,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         _KeyBindingList = single_threaded_observable_vector(std::move(keyBindingList));
     }
 
-    void Actions::KeyChordEditor_KeyDown(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::KeyRoutedEventArgs const& e)
-    {
-        const auto& senderTB{ sender.as<TextBox>() };
-        const auto& kbdVM{ senderTB.DataContext().as<Editor::KeyBindingViewModel>() };
-        if (e.OriginalKey() == VirtualKey::Enter)
-        {
-            // Fun fact: this is happening _before_ "_ProposedKeys" gets updated
-            // with the two-way data binding. So we need to directly extract the text
-            // and tell the view model to update itself.
-            get_self<KeyBindingViewModel>(kbdVM)->AttemptAcceptChanges(senderTB.Text());
-
-            // For an unknown reason, when 'AcceptChangesFlyout' is set in the code above,
-            // the flyout isn't shown, forcing the 'Enter' key to do nothing.
-            // To get around this, detect if the flyout was set, and display it
-            // on the text box.
-            if (kbdVM.AcceptChangesFlyout() != nullptr)
-            {
-                kbdVM.AcceptChangesFlyout().ShowAt(senderTB);
-            }
-            e.Handled(true);
-        }
-        else if (e.OriginalKey() == VirtualKey::Escape)
-        {
-            kbdVM.CancelChanges();
-            e.Handled(true);
-        }
-    }
-
     void Actions::AddNew_Click(const IInspectable& /*sender*/, const RoutedEventArgs& /*eventArgs*/)
     {
         // Create the new key binding and register all of the event handlers.
@@ -314,7 +264,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
                 // update view model
                 auto senderVMImpl{ get_self<KeyBindingViewModel>(senderVM) };
-                senderVMImpl->Keys(args.NewKeys());
+                senderVMImpl->CurrentKeys(args.NewKeys());
             }
 
             // If the action was changed,
@@ -418,7 +368,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         for (uint32_t i = 0; i < _KeyBindingList.Size(); ++i)
         {
             const auto kbdVM{ get_self<KeyBindingViewModel>(_KeyBindingList.GetAt(i)) };
-            const auto& otherKeys{ kbdVM->Keys() };
+            const auto& otherKeys{ kbdVM->CurrentKeys() };
             if (keys.Modifiers() == otherKeys.Modifiers() && keys.Vkey() == otherKeys.Vkey())
             {
                 return i;
diff --git a/src/cascadia/TerminalSettingsEditor/Actions.h b/src/cascadia/TerminalSettingsEditor/Actions.h
index 14d060a8a0d..9c4d37cf618 100644
--- a/src/cascadia/TerminalSettingsEditor/Actions.h
+++ b/src/cascadia/TerminalSettingsEditor/Actions.h
@@ -60,9 +60,9 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         void ToggleEditMode();
         void DisableEditMode() { IsInEditMode(false); }
         void AttemptAcceptChanges();
-        void AttemptAcceptChanges(hstring newKeyChordText);
+        void AttemptAcceptChanges(const Control::KeyChord newKeys);
         void CancelChanges();
-        void DeleteKeyBinding() { _DeleteKeyBindingRequestedHandlers(*this, _Keys); }
+        void DeleteKeyBinding() { _DeleteKeyBindingRequestedHandlers(*this, _CurrentKeys); }
 
         // ProposedAction:   the entry selected by the combo box; may disagree with the settings model.
         // CurrentAction:    the combo box item that maps to the settings model value.
@@ -77,10 +77,10 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         VIEW_MODEL_OBSERVABLE_PROPERTY(hstring, CurrentAction);
         WINRT_PROPERTY(Windows::Foundation::Collections::IObservableVector<hstring>, AvailableActions, nullptr);
 
-        // ProposedKeys: the text shown in the text box; may disagree with the settings model.
-        // Keys:         the key chord bound in the settings model.
-        VIEW_MODEL_OBSERVABLE_PROPERTY(hstring, ProposedKeys);
-        VIEW_MODEL_OBSERVABLE_PROPERTY(Control::KeyChord, Keys, nullptr);
+        // ProposedKeys: the keys proposed by the control; may disagree with the settings model.
+        // CurrentKeys:  the key chord bound in the settings model.
+        VIEW_MODEL_OBSERVABLE_PROPERTY(Control::KeyChord, ProposedKeys);
+        VIEW_MODEL_OBSERVABLE_PROPERTY(Control::KeyChord, CurrentKeys, nullptr);
 
         VIEW_MODEL_OBSERVABLE_PROPERTY(bool, IsInEditMode, false);
         VIEW_MODEL_OBSERVABLE_PROPERTY(bool, IsNewlyAdded, false);
@@ -114,7 +114,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
         void OnNavigatedTo(const winrt::Windows::UI::Xaml::Navigation::NavigationEventArgs& e);
         Windows::UI::Xaml::Automation::Peers::AutomationPeer OnCreateAutomationPeer();
-        void KeyChordEditor_KeyDown(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::KeyRoutedEventArgs const& e);
         void AddNew_Click(const IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& eventArgs);
 
         WINRT_CALLBACK(PropertyChanged, Windows::UI::Xaml::Data::PropertyChangedEventHandler);
diff --git a/src/cascadia/TerminalSettingsEditor/Actions.idl b/src/cascadia/TerminalSettingsEditor/Actions.idl
index 98d8ee3e6f6..31c8570cce9 100644
--- a/src/cascadia/TerminalSettingsEditor/Actions.idl
+++ b/src/cascadia/TerminalSettingsEditor/Actions.idl
@@ -23,7 +23,7 @@ namespace Microsoft.Terminal.Settings.Editor
         Boolean ShowEditButton { get; };
         Boolean IsInEditMode { get; };
         Boolean IsNewlyAdded { get; };
-        String ProposedKeys;
+        Microsoft.Terminal.Control.KeyChord ProposedKeys;
         Object ProposedAction;
         Windows.UI.Xaml.Controls.Flyout AcceptChangesFlyout;
         String EditButtonName { get; };
diff --git a/src/cascadia/TerminalSettingsEditor/Actions.xaml b/src/cascadia/TerminalSettingsEditor/Actions.xaml
index d1d75c8a0bc..e4dd4ccc7a0 100644
--- a/src/cascadia/TerminalSettingsEditor/Actions.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Actions.xaml
@@ -133,13 +133,9 @@
                 <Setter Property="TextWrapping" Value="WrapWholeWords" />
             </Style>
             <Style x:Key="KeyChordEditorStyle"
-                   BasedOn="{StaticResource DefaultTextBoxStyle}"
-                   TargetType="TextBox">
+                   TargetType="local:KeyChordListener">
                 <Setter Property="HorizontalAlignment" Value="Right" />
                 <Setter Property="VerticalAlignment" Value="Center" />
-                <Setter Property="TextAlignment" Value="Right" />
-                <Setter Property="TextWrapping" Value="Wrap" />
-                <Setter Property="IsSpellCheckEnabled" Value="False" />
             </Style>
             <x:Int32 x:Key="EditButtonSize">32</x:Int32>
             <x:Double x:Key="EditButtonIconSize">15</x:Double>
@@ -202,7 +198,8 @@
                                    Visibility="{x:Bind IsInEditMode, Mode=OneWay, Converter={StaticResource InvertedBooleanToVisibilityConverter}}" />
 
                         <!--  Edit Mode: Action Combo-box  -->
-                        <ComboBox Grid.Column="0"
+                        <ComboBox x:Uid="Actions_ActionComboBox"
+                                  Grid.Column="0"
                                   VerticalAlignment="Center"
                                   ItemsSource="{x:Bind AvailableActions, Mode=OneWay}"
                                   SelectedItem="{x:Bind ProposedAction, Mode=TwoWay}"
@@ -222,13 +219,11 @@
                                        TextWrapping="WrapWholeWords" />
                         </Border>
 
-                        <!--  Edit Mode: Key Chord Text Box  -->
-                        <TextBox Grid.Column="1"
-                                 DataContext="{x:Bind Mode=OneWay}"
-                                 KeyDown="KeyChordEditor_KeyDown"
-                                 Style="{StaticResource KeyChordEditorStyle}"
-                                 Text="{x:Bind ProposedKeys, Mode=TwoWay}"
-                                 Visibility="{x:Bind IsInEditMode, Mode=OneWay}" />
+                        <!--  Edit Mode: Key Chord Listener  -->
+                        <local:KeyChordListener Grid.Column="1"
+                                                Keys="{x:Bind ProposedKeys, Mode=TwoWay}"
+                                                Style="{StaticResource KeyChordEditorStyle}"
+                                                Visibility="{x:Bind IsInEditMode, Mode=OneWay}" />
 
                         <!--  Edit Button  -->
                         <Button x:Uid="Actions_EditButton"
diff --git a/src/cascadia/TerminalSettingsEditor/KeyChordListener.cpp b/src/cascadia/TerminalSettingsEditor/KeyChordListener.cpp
new file mode 100644
index 00000000000..f85dca27c5d
--- /dev/null
+++ b/src/cascadia/TerminalSettingsEditor/KeyChordListener.cpp
@@ -0,0 +1,135 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "pch.h"
+#include "KeyChordListener.h"
+#include "KeyChordListener.g.cpp"
+#include "LibraryResources.h"
+
+using namespace winrt::Windows::UI::Core;
+using namespace winrt::Windows::UI::Xaml;
+using namespace winrt::Windows::UI::Xaml::Controls;
+using namespace winrt::Windows::UI::Xaml::Data;
+using namespace winrt::Windows::Foundation;
+using namespace winrt::Windows::System;
+using namespace winrt::Windows::UI::Xaml::Input;
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
+{
+    DependencyProperty KeyChordListener::_KeysProperty{ nullptr };
+
+    static constexpr std::array ModifierKeys{
+        VirtualKey::Shift,
+        VirtualKey::Control,
+        VirtualKey::Menu,
+        VirtualKey::LeftWindows,
+        VirtualKey::RightWindows,
+        VirtualKey::LeftShift,
+        VirtualKey::LeftControl,
+        VirtualKey::RightControl,
+        VirtualKey::LeftMenu,
+        VirtualKey::RightMenu
+    };
+
+    static VirtualKeyModifiers _GetModifiers()
+    {
+        const auto window{ CoreWindow::GetForCurrentThread() };
+
+        VirtualKeyModifiers flags = VirtualKeyModifiers::None;
+        for (const auto mod : ModifierKeys)
+        {
+            const auto state = window.GetKeyState(mod);
+            const auto isDown = WI_IsFlagSet(state, CoreVirtualKeyStates::Down);
+
+            if (isDown)
+            {
+                switch (mod)
+                {
+                case VirtualKey::Control:
+                case VirtualKey::LeftControl:
+                case VirtualKey::RightControl:
+                    flags |= VirtualKeyModifiers::Control;
+                    break;
+                case VirtualKey::Menu:
+                case VirtualKey::LeftMenu:
+                case VirtualKey::RightMenu:
+                    flags |= VirtualKeyModifiers::Menu;
+                    break;
+                case VirtualKey::Shift:
+                case VirtualKey::LeftShift:
+                    flags |= VirtualKeyModifiers::Shift;
+                    break;
+                case VirtualKey::LeftWindows:
+                case VirtualKey::RightWindows:
+                    flags |= VirtualKeyModifiers::Windows;
+                    break;
+                }
+            }
+        }
+        return flags;
+    }
+
+    KeyChordListener::KeyChordListener()
+    {
+        InitializeComponent();
+        _InitializeProperties();
+    }
+
+    void KeyChordListener::_InitializeProperties()
+    {
+        // Initialize any KeyChordListener dependency properties here.
+        // This performs a lazy load on these properties, instead of
+        // initializing them when the DLL loads.
+        if (!_KeysProperty)
+        {
+            _KeysProperty =
+                DependencyProperty::Register(
+                    L"Keys",
+                    xaml_typename<Control::KeyChord>(),
+                    xaml_typename<Editor::KeyChordListener>(),
+                    PropertyMetadata{ nullptr, PropertyChangedCallback{ &KeyChordListener::_OnKeysChanged } });
+        }
+    }
+
+    void KeyChordListener::_OnKeysChanged(DependencyObject const& d, DependencyPropertyChangedEventArgs const& e)
+    {
+        if (auto control{ d.try_as<Editor::KeyChordListener>() })
+        {
+            auto controlImpl{ get_self<KeyChordListener>(control) };
+            TextBox tb{ controlImpl->FindName(L"KeyChordTextBox").as<TextBox>() };
+            tb.Text(Model::KeyChordSerialization::ToString(unbox_value<Control::KeyChord>(e.NewValue())));
+            if (auto automationPeer{ Automation::Peers::FrameworkElementAutomationPeer::FromElement(tb) })
+            {
+                automationPeer.RaiseNotificationEvent(
+                    Automation::Peers::AutomationNotificationKind::ActionCompleted,
+                    Automation::Peers::AutomationNotificationProcessing::MostRecent,
+                    tb.Text(),
+                    L"KeyChordListenerText");
+            }
+        }
+    }
+
+    void KeyChordListener::KeyChordTextBox_KeyDown(IInspectable const& /*sender*/, KeyRoutedEventArgs const& e)
+    {
+        const auto key{ e.OriginalKey() };
+        for (const auto mod : ModifierKeys)
+        {
+            if (key == mod)
+            {
+                // Ignore modifier keys
+                return;
+            }
+        }
+
+        const auto modifiers{ _GetModifiers() };
+        if (key == VirtualKey::Tab && (modifiers == VirtualKeyModifiers::None || modifiers == VirtualKeyModifiers::Shift))
+        {
+            // [Shift]+[Tab] && [Tab] are needed for keyboard navigation
+            return;
+        }
+
+        // Permitted key events are used to update _Keys
+        Keys({ modifiers, static_cast<int32_t>(key) });
+        e.Handled(true);
+    }
+}
diff --git a/src/cascadia/TerminalSettingsEditor/KeyChordListener.h b/src/cascadia/TerminalSettingsEditor/KeyChordListener.h
new file mode 100644
index 00000000000..526aa76dd66
--- /dev/null
+++ b/src/cascadia/TerminalSettingsEditor/KeyChordListener.h
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#pragma once
+
+#include "KeyChordListener.g.h"
+#include "Utils.h"
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
+{
+    struct KeyChordListener : KeyChordListenerT<KeyChordListener>
+    {
+    public:
+        KeyChordListener();
+
+        void KeyChordTextBox_KeyDown(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::KeyRoutedEventArgs const& e);
+
+        DEPENDENCY_PROPERTY(Control::KeyChord, Keys);
+
+    private:
+        static void _InitializeProperties();
+        static void _OnKeysChanged(Windows::UI::Xaml::DependencyObject const& d, Windows::UI::Xaml::DependencyPropertyChangedEventArgs const& e);
+    };
+}
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::factory_implementation
+{
+    BASIC_FACTORY(KeyChordListener);
+}
diff --git a/src/cascadia/TerminalSettingsEditor/KeyChordListener.idl b/src/cascadia/TerminalSettingsEditor/KeyChordListener.idl
new file mode 100644
index 00000000000..122efe08f24
--- /dev/null
+++ b/src/cascadia/TerminalSettingsEditor/KeyChordListener.idl
@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+namespace Microsoft.Terminal.Settings.Editor
+{
+    [default_interface] runtimeclass KeyChordListener : Windows.UI.Xaml.Controls.UserControl
+    {
+        KeyChordListener();
+
+        Microsoft.Terminal.Control.KeyChord Keys;
+        static Windows.UI.Xaml.DependencyProperty KeysProperty { get; };
+    }
+}
diff --git a/src/cascadia/TerminalSettingsEditor/KeyChordListener.xaml b/src/cascadia/TerminalSettingsEditor/KeyChordListener.xaml
new file mode 100644
index 00000000000..9068ede48dd
--- /dev/null
+++ b/src/cascadia/TerminalSettingsEditor/KeyChordListener.xaml
@@ -0,0 +1,17 @@
+<UserControl x:Class="Microsoft.Terminal.Settings.Editor.KeyChordListener"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d">
+
+    <!--  Use PreviewKeyDown to prevent ctrl+a from selecting  -->
+    <TextBox x:Name="KeyChordTextBox"
+             x:Uid="KeyChordListener"
+             IsReadOnly="True"
+             IsSpellCheckEnabled="False"
+             IsTabStop="True"
+             PreviewKeyDown="KeyChordTextBox_KeyDown"
+             TextAlignment="Right"
+             TextWrapping="Wrap" />
+</UserControl>
diff --git a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj
index 9dea36236da..4861cb1f443 100644
--- a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj
+++ b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj
@@ -60,6 +60,9 @@
     <ClInclude Include="InvertedBooleanToVisibilityConverter.h">
       <DependentUpon>Converters.idl</DependentUpon>
     </ClInclude>
+    <ClInclude Include="KeyChordListener.h">
+      <DependentUpon>KeyChordListener.xaml</DependentUpon>
+    </ClInclude>
     <ClInclude Include="PercentageSignConverter.h">
       <DependentUpon>Converters.idl</DependentUpon>
     </ClInclude>
@@ -135,6 +138,9 @@
     <Page Include="Interaction.xaml">
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="KeyChordListener.xaml">
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Launch.xaml">
       <SubType>Designer</SubType>
     </Page>
@@ -183,6 +189,9 @@
     <ClCompile Include="InvertedBooleanToVisibilityConverter.cpp">
       <DependentUpon>Converters.idl</DependentUpon>
     </ClCompile>
+    <ClCompile Include="KeyChordListener.cpp">
+      <DependentUpon>KeyChordListener.xaml</DependentUpon>
+    </ClCompile>
     <ClCompile Include="PercentageSignConverter.cpp">
       <DependentUpon>Converters.idl</DependentUpon>
     </ClCompile>
@@ -260,6 +269,10 @@
       <DependentUpon>ColorSchemes.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Midl>
+    <Midl Include="KeyChordListener.idl">
+      <DependentUpon>KeyChordListener.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Midl>
     <Midl Include="Launch.idl">
       <DependentUpon>Launch.xaml</DependentUpon>
       <SubType>Code</SubType>
diff --git a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters
index 1541f175e55..66e8b687d1f 100644
--- a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters
+++ b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters
@@ -20,6 +20,7 @@
     <ClInclude Include="PercentageSignConverter.h">
       <Filter>Converters</Filter>
     </ClInclude>
+    <ClInclude Include="PreviewConnection.h" />
   </ItemGroup>
   <ItemGroup>
     <Midl Include="EnumEntry.idl" />
@@ -44,10 +45,13 @@
     <Page Include="Rendering.xaml" />
     <Page Include="Actions.xaml" />
     <Page Include="SettingContainerStyle.xaml" />
+    <Page Include="AddProfile.xaml" />
+    <Page Include="ReadOnlyActions.xaml" />
+    <Page Include="KeyChordListener.xaml" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Converters">
       <UniqueIdentifier>{00f725c8-41b4-40a8-995e-8ee2e49a4a4c}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
index 5c4f305e4f1..18c87847eaf 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
@@ -1158,4 +1158,20 @@
     <value>Add new</value>
     <comment>Button label that creates a new action on the actions page.</comment>
   </data>
+  <data name="Actions_ActionComboBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Action</value>
+    <comment>Label for a control that sets the action of a key binding.</comment>
+  </data>
+  <data name="KeyChordListener.[using:Windows.UI.Xaml.Automation]AutomationProperties.HelpText" xml:space="preserve">
+    <value>Input your desired keyboard shortcut.</value>
+    <comment>Help text directing users how to use the "KeyChordListener" control. Pressing a keyboard shortcut will be recorded by this control.</comment>
+  </data>
+  <data name="KeyChordListener.[using:Windows.UI.Xaml.Automation]AutomationProperties.LocalizedControlType" xml:space="preserve">
+    <value>shortcut listener</value>
+    <comment>The control type for a control that awaits keyboard input and records it.</comment>
+  </data>
+  <data name="KeyChordListener.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Shortcut</value>
+    <comment>The label for a "key chord listener" control that sets the keys a key binding is bound to.</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/cascadia/TerminalSettingsEditor/pch.h b/src/cascadia/TerminalSettingsEditor/pch.h
index 49065c556bb..7c427ebe23f 100644
--- a/src/cascadia/TerminalSettingsEditor/pch.h
+++ b/src/cascadia/TerminalSettingsEditor/pch.h
@@ -24,6 +24,7 @@
 #include <winrt/Windows.Foundation.h>
 #include <winrt/Windows.Foundation.Collections.h>
 #include <winrt/Windows.Globalization.h>
+#include <winrt/Windows.System.h>
 #include <winrt/Windows.UI.h>
 #include <winrt/Windows.UI.Core.h>
 #include <winrt/Windows.UI.Input.h>
@@ -31,6 +32,7 @@
 #include <winrt/Windows.UI.Text.h>
 #include <winrt/Windows.UI.Xaml.h>
 #include <winrt/Windows.UI.Xaml.Automation.h>
+#include <winrt/Windows.UI.Xaml.Automation.Peers.h>
 #include <winrt/Windows.UI.Xaml.Controls.h>
 #include <winrt/Windows.UI.Xaml.Controls.Primitives.h>
 #include <winrt/Windows.UI.Xaml.Data.h>